From 3f9ab9bc91d9e6acab651cb842d35a2477a2bade Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 20 Mar 2017 18:40:28 +0530
Subject: Protect tag partial

---
 .../protected_tags/_create_protected_tag.html.haml | 32 ++++++++++++++++++++++
 .../projects/protected_tags/_dropdown.html.haml    | 15 ++++++++++
 app/views/projects/protected_tags/_index.html.haml | 18 ++++++++++++
 .../projects/protected_tags/_tags_list.html.haml   |  6 ++++
 4 files changed, 71 insertions(+)
 create mode 100644 app/views/projects/protected_tags/_create_protected_tag.html.haml
 create mode 100644 app/views/projects/protected_tags/_dropdown.html.haml
 create mode 100644 app/views/projects/protected_tags/_index.html.haml
 create mode 100644 app/views/projects/protected_tags/_tags_list.html.haml

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
new file mode 100644
index 00000000000..6ffe7b4c24f
--- /dev/null
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -0,0 +1,32 @@
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f|
+  .panel.panel-default
+    .panel-heading
+      %h3.panel-title
+        Protect a tag
+    .panel-body
+      .form-horizontal
+        = form_errors(@protected_branch)
+        .form-group
+          = f.label :name, class: 'col-md-2 text-right' do
+            Tag:
+          .col-md-10
+            = render partial: "projects/protected_tags/dropdown", locals: { f: f }
+            .help-block
+              = link_to 'Wildcards', help_page_path('user/project/protected_branches', anchor: 'wildcard-protected-branches')
+              such as
+              %code *-stable
+              or
+              %code production/*
+              are supported
+        .form-group
+          %label.col-md-2.text-right{ for: 'push_access_levels_attributes' }
+            Allowed to push:
+          .col-md-10
+            .push_access_levels-container
+              = dropdown_tag('Select',
+                             options: { toggle_class: 'js-allowed-to-push wide',
+                             dropdown_class: 'dropdown-menu-selectable',
+                             data: { field_name: 'protected_branch[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
+
+    .panel-footer
+      = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/protected_tags/_dropdown.html.haml b/app/views/projects/protected_tags/_dropdown.html.haml
new file mode 100644
index 00000000000..3da153bc521
--- /dev/null
+++ b/app/views/projects/protected_tags/_dropdown.html.haml
@@ -0,0 +1,15 @@
+= f.hidden_field(:name)
+
+= dropdown_tag('Select tag or create wildcard',
+               options: { toggle_class: 'js-protected-tag-select js-filter-submit wide',
+                          filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search protected tag",
+                          footer_content: true,
+                          data: { show_no: true, show_any: true, show_upcoming: true,
+                                  selected: params[:protected_branch_name],
+                                  project_id: @project.try(:id) } }) do
+
+  %ul.dropdown-footer-list
+    %li
+      = link_to '#', title: "New Protected Tag", class: "create-new-protected-tag" do
+        Create wildcard
+        %code
diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
new file mode 100644
index 00000000000..3a1da1202e9
--- /dev/null
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -0,0 +1,18 @@
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_bundle_tag('protected_branches')
+
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      Protected tags
+    %p.prepend-top-20
+      By default, Protected branches are designed to:
+      %ul
+        %li Prevent tag pushes from everybody except Masters
+        %li Prevent <strong>anyone</strong> from force pushing to the tag
+        %li Prevent <strong>anyone</strong> from deleting the tag
+  .col-lg-9
+    - if can? current_user, :admin_project, @project
+      = render 'projects/protected_tags/create_protected_tag'
+
+    = render "projects/protected_tags/tags_list"
diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml
new file mode 100644
index 00000000000..e7ce90393e9
--- /dev/null
+++ b/app/views/projects/protected_tags/_tags_list.html.haml
@@ -0,0 +1,6 @@
+.panel.panel-default.protected-tags-list
+  .panel-heading
+    %h3.panel-title
+      Protected tag (0)
+  %p.settings-message.text-center
+    There are currently no protected tags, protect a tag with the form above.
-- 
cgit v1.2.1


From 421a386d8c76d9947bdfc007b890c853313f0c46 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 20 Mar 2017 18:40:55 +0530
Subject: Apply styles to protected tag same as protected branch

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

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index efa47be9a73..f7ef9275560 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -745,7 +745,8 @@ pre.light-well {
   }
 }
 
-.protected-branches-list {
+.protected-branches-list,
+.protected-tags-list {
   margin-bottom: 30px;
 
   a {
-- 
cgit v1.2.1


From d20c5427af94c7043c3cc7c04288a056921b812c Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 20 Mar 2017 18:41:19 +0530
Subject: Render protected tags within Project Settings > Repository

---
 app/views/projects/settings/repository/show.html.haml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml
index 4c02302e161..5402320cb66 100644
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -3,3 +3,4 @@
 
 = render @deploy_keys
 = render "projects/protected_branches/index"
+= render "projects/protected_tags/index"
-- 
cgit v1.2.1


From 97a02fca6bf24a2e6e5feb4b164a9265511903c2 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Tue, 21 Mar 2017 21:21:56 +0530
Subject: Protected Tags Classes

---
 .../protected_tag_access_dropdown.js               | 29 ++++++++
 .../protected_tags/protected_tag_create.js         | 45 ++++++++++++
 .../protected_tags/protected_tag_dropdown.js       | 79 ++++++++++++++++++++++
 3 files changed, 153 insertions(+)
 create mode 100644 app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
 create mode 100644 app/assets/javascripts/protected_tags/protected_tag_create.js
 create mode 100644 app/assets/javascripts/protected_tags/protected_tag_dropdown.js

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
new file mode 100644
index 00000000000..b85c2991dd9
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
@@ -0,0 +1,29 @@
+/* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, max-len */
+
+(global => {
+  global.gl = global.gl || {};
+
+  gl.ProtectedTagAccessDropdown = class {
+    constructor(options) {
+      const { $dropdown, data, onSelect } = options;
+
+      $dropdown.glDropdown({
+        data: data,
+        selectable: true,
+        inputId: $dropdown.data('input-id'),
+        fieldName: $dropdown.data('field-name'),
+        toggleLabel(item, el) {
+          if (el.is('.is-active')) {
+            return item.text;
+          } else {
+            return 'Select';
+          }
+        },
+        clicked(item, $el, e) {
+          e.preventDefault();
+          onSelect();
+        }
+      });
+    }
+  };
+})(window);
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
new file mode 100644
index 00000000000..4c652e7747f
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -0,0 +1,45 @@
+/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
+/* global ProtectedTagDropdown */
+
+(global => {
+  global.gl = global.gl || {};
+
+  gl.ProtectedTagCreate = class {
+    constructor() {
+      this.$wrap = this.$form = $('.new_protected_tag');
+      this.buildDropdowns();
+    }
+
+    buildDropdowns() {
+      const $allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+
+      // Cache callback
+      this.onSelectCallback = this.onSelect.bind(this);
+
+      // Allowed to Push dropdown
+      new gl.ProtectedTagAccessDropdown({
+        $dropdown: $allowedToPushDropdown,
+        data: gon.push_access_levels,
+        onSelect: this.onSelectCallback
+      });
+
+      // Select default
+      $allowedToPushDropdown.data('glDropdown').selectRowAtIndex(0);
+
+      // Protected tag dropdown
+      new ProtectedTagDropdown({
+        $dropdown: this.$wrap.find('.js-protected-tag-select'),
+        onSelect: this.onSelectCallback
+      });
+    }
+
+    // This will run after clicked callback
+    onSelect() {
+      // Enable submit button
+      const $tagInput = this.$wrap.find('input[name="protected_tag[name]"]');
+      const $allowedToPushInput = this.$wrap.find('input[name="protected_tag[push_access_levels_attributes][0][access_level]"]');
+
+      this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToPushInput.length));
+    }
+  };
+})(window);
diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
new file mode 100644
index 00000000000..5a0356f502c
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -0,0 +1,79 @@
+/* eslint-disable comma-dangle, no-unused-vars */
+
+class ProtectedTagDropdown {
+  constructor(options) {
+    this.onSelect = options.onSelect;
+    this.$dropdown = options.$dropdown;
+    this.$dropdownContainer = this.$dropdown.parent();
+    this.$dropdownFooter = this.$dropdownContainer.find('.dropdown-footer');
+    this.$protectedTag = this.$dropdownContainer.find('.create-new-protected-tag');
+
+    this.buildDropdown();
+    this.bindEvents();
+
+    // Hide footer
+    this.$dropdownFooter.addClass('hidden');
+  }
+
+  buildDropdown() {
+    this.$dropdown.glDropdown({
+      data: this.getProtectedTags.bind(this),
+      filterable: true,
+      remote: false,
+      search: {
+        fields: ['title']
+      },
+      selectable: true,
+      toggleLabel(selected) {
+        return (selected && 'id' in selected) ? selected.title : 'Protected Tag';
+      },
+      fieldName: 'protected_tag[name]',
+      text(protectedTag) {
+        return _.escape(protectedTag.title);
+      },
+      id(protectedTag) {
+        return _.escape(protectedTag.id);
+      },
+      onFilter: this.toggleCreateNewButton.bind(this),
+      clicked: (item, $el, e) => {
+        e.preventDefault();
+        this.onSelect();
+      }
+    });
+  }
+
+  bindEvents() {
+    this.$protectedTag.on('click', this.onClickCreateWildcard.bind(this));
+  }
+
+  onClickCreateWildcard() {
+    this.$dropdown.data('glDropdown').remote.execute();
+    this.$dropdown.data('glDropdown').selectRowAtIndex();
+  }
+
+  getProtectedTags(term, callback) {
+    if (this.selectedTag) {
+      callback(gon.open_branches.concat(this.selectedTag));
+    } else {
+      callback(gon.open_branches);
+    }
+  }
+
+  toggleCreateNewButton(tagName) {
+    this.selectedTag = {
+      title: tagName,
+      id: tagName,
+      text: tagName
+    };
+
+    if (tagName) {
+      this.$dropdownContainer
+        .find('.create-new-protected-tag code')
+        .text(tagName);
+    }
+
+    this.$dropdownFooter.toggleClass('hidden', !tagName);
+  }
+}
+
+window.ProtectedTagDropdown = ProtectedTagDropdown;
-- 
cgit v1.2.1


From c5c4370a7bb71130c1fcca57a069e3e8626d9108 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Tue, 21 Mar 2017 21:22:12 +0530
Subject: Re-export protected tag classes

---
 app/assets/javascripts/protected_tags/protected_tags_bundle.js | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 app/assets/javascripts/protected_tags/protected_tags_bundle.js

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tags_bundle.js b/app/assets/javascripts/protected_tags/protected_tags_bundle.js
new file mode 100644
index 00000000000..d84d2e1ef70
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tags_bundle.js
@@ -0,0 +1,3 @@
+require('./protected_tag_access_dropdown');
+require('./protected_tag_create');
+require('./protected_tag_dropdown');
-- 
cgit v1.2.1


From 167b86000838aab32b13e19f4213805f460b7d46 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Tue, 21 Mar 2017 21:22:38 +0530
Subject: Initialize Protected tags feature under Repository Settings page

---
 app/assets/javascripts/dispatcher.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app')

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 3557f6f617e..6234092bdc2 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -320,6 +320,7 @@ const UserCallout = require('./user_callout');
         case 'projects:repository:show':
           new gl.ProtectedBranchCreate();
           new gl.ProtectedBranchEditList();
+          new gl.ProtectedTagCreate();
           break;
         case 'projects:ci_cd:show':
           new gl.ProjectVariables();
-- 
cgit v1.2.1


From 0fd2fd652a18ccceb725ce2f8f7683ad6ad3c224 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Tue, 21 Mar 2017 21:23:17 +0530
Subject: Update property names for tags

---
 app/views/projects/protected_tags/_create_protected_tag.html.haml | 4 ++--
 app/views/projects/protected_tags/_dropdown.html.haml             | 2 +-
 app/views/projects/protected_tags/_index.html.haml                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index 6ffe7b4c24f..110c24ac9e4 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch] do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new_protected_tag' } do |f|
   .panel.panel-default
     .panel-heading
       %h3.panel-title
@@ -26,7 +26,7 @@
               = dropdown_tag('Select',
                              options: { toggle_class: 'js-allowed-to-push wide',
                              dropdown_class: 'dropdown-menu-selectable',
-                             data: { field_name: 'protected_branch[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
+                             data: { field_name: 'protected_tag[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
 
     .panel-footer
       = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/protected_tags/_dropdown.html.haml b/app/views/projects/protected_tags/_dropdown.html.haml
index 3da153bc521..74851519077 100644
--- a/app/views/projects/protected_tags/_dropdown.html.haml
+++ b/app/views/projects/protected_tags/_dropdown.html.haml
@@ -5,7 +5,7 @@
                           filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search protected tag",
                           footer_content: true,
                           data: { show_no: true, show_any: true, show_upcoming: true,
-                                  selected: params[:protected_branch_name],
+                                  selected: params[:protected_tag_name],
                                   project_id: @project.try(:id) } }) do
 
   %ul.dropdown-footer-list
diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
index 3a1da1202e9..0965bf75eae 100644
--- a/app/views/projects/protected_tags/_index.html.haml
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -1,5 +1,5 @@
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('protected_branches')
+  = page_specific_javascript_bundle_tag('protected_tags')
 
 .row.prepend-top-default.append-bottom-default
   .col-lg-3
-- 
cgit v1.2.1


From 91ed8ed687ee9edbda0098475e66ad41f886d7a5 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Wed, 15 Mar 2017 22:29:07 +0000
Subject: Protected tags copy/paste from protected branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell
---
 .../projects/protected_tags_controller.rb          | 58 ++++++++++++++++++++++
 app/models/concerns/protected_ref_access.rb        | 21 ++++++++
 app/models/concerns/protected_tag_access.rb        | 21 ++++++++
 app/models/project.rb                              |  1 +
 app/models/protected_branch.rb                     | 39 +++------------
 app/models/protected_ref_matcher.rb                | 52 +++++++++++++++++++
 app/models/protected_tag.rb                        | 39 +++++++++++++++
 app/models/protected_tag/push_access_level.rb      | 21 ++++++++
 app/services/protected_tags/create_service.rb      | 11 ++++
 app/services/protected_tags/update_service.rb      | 13 +++++
 10 files changed, 244 insertions(+), 32 deletions(-)
 create mode 100644 app/controllers/projects/protected_tags_controller.rb
 create mode 100644 app/models/concerns/protected_ref_access.rb
 create mode 100644 app/models/concerns/protected_tag_access.rb
 create mode 100644 app/models/protected_ref_matcher.rb
 create mode 100644 app/models/protected_tag.rb
 create mode 100644 app/models/protected_tag/push_access_level.rb
 create mode 100644 app/services/protected_tags/create_service.rb
 create mode 100644 app/services/protected_tags/update_service.rb

(limited to 'app')

diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
new file mode 100644
index 00000000000..5ab5d1d997b
--- /dev/null
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -0,0 +1,58 @@
+class Projects::ProtectedTagsController < Projects::ApplicationController
+  include RepositorySettingsRedirect
+  # Authorize
+  before_action :require_non_empty_project
+  before_action :authorize_admin_project!
+  before_action :load_protected_tag, only: [:show, :update, :destroy]
+
+  layout "project_settings"
+
+  def index
+    redirect_to_repository_settings(@project)
+  end
+
+  def create
+    @protected_tag = ::ProtectedTags::CreateService.new(@project, current_user, protected_tag_params).execute
+    unless @protected_tag.persisted?
+      flash[:alert] = @protected_tags.errors.full_messages.join(', ').html_safe
+    end
+    redirect_to_repository_settings(@project)
+  end
+
+  def show
+    @matching_tags = @protected_tag.matching(@project.repository.tags)
+  end
+
+  def update
+    @protected_tag = ::ProtectedTags::UpdateService.new(@project, current_user, protected_tag_params).execute(@protected_tag)
+
+    if @protected_tag.valid?
+      respond_to do |format|
+        format.json { render json: @protected_tag, status: :ok }
+      end
+    else
+      respond_to do |format|
+        format.json { render json: @protected_tag.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def destroy
+    @protected_tag.destroy
+
+    respond_to do |format|
+      format.html { redirect_to_repository_settings(@project) }
+      format.js { head :ok }
+    end
+  end
+
+  private
+
+  def load_protected_tag
+    @protected_tag = @project.protected_tags.find(params[:id])
+  end
+
+  def protected_tag_params
+    params.require(:protected_tag).permit(:name, push_access_levels_attributes: [:access_level, :id])
+  end
+end
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
new file mode 100644
index 00000000000..9dd4d9c6f24
--- /dev/null
+++ b/app/models/concerns/protected_ref_access.rb
@@ -0,0 +1,21 @@
+module ProtectedBranchAccess
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :protected_branch
+    delegate :project, to: :protected_branch
+
+    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
+    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+  end
+
+  def humanize
+    self.class.human_access_levels[self.access_level]
+  end
+
+  def check_access(user)
+    return true if user.is_admin?
+
+    project.team.max_member_access(user.id) >= access_level
+  end
+end
diff --git a/app/models/concerns/protected_tag_access.rb b/app/models/concerns/protected_tag_access.rb
new file mode 100644
index 00000000000..cf66a6434b5
--- /dev/null
+++ b/app/models/concerns/protected_tag_access.rb
@@ -0,0 +1,21 @@
+module ProtectedTagAccess
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :protected_tag
+    delegate :project, to: :protected_tag
+
+    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
+    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+  end
+
+  def humanize
+    self.class.human_access_levels[self.access_level]
+  end
+
+  def check_access(user)
+    return true if user.is_admin?
+
+    project.team.max_member_access(user.id) >= access_level
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 4a3faff7d5b..3f1a8a1a1e1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -132,6 +132,7 @@ class Project < ActiveRecord::Base
   has_many :snippets,           dependent: :destroy, class_name: 'ProjectSnippet'
   has_many :hooks,              dependent: :destroy, class_name: 'ProjectHook'
   has_many :protected_branches, dependent: :destroy
+  has_many :protected_tags, dependent: :destroy
 
   has_many :project_authorizations
   has_many :authorized_users, through: :project_authorizations, source: :user, class_name: 'User'
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 39e979ef15b..7681d5b5112 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -18,50 +18,25 @@ class ProtectedBranch < ActiveRecord::Base
     project.commit(self.name)
   end
 
-  # Returns all protected branches that match the given branch name.
-  # This realizes all records from the scope built up so far, and does
-  # _not_ return a relation.
-  #
-  # This method optionally takes in a list of `protected_branches` to search
-  # through, to avoid calling out to the database.
   def self.matching(branch_name, protected_branches: nil)
-    (protected_branches || all).select { |protected_branch| protected_branch.matches?(branch_name) }
+    ProtectedRefMatcher.matching(ProtectedBranch, branch_name, protected_refs: protected_branches)
   end
 
-  # Returns all branches (among the given list of branches [`Gitlab::Git::Branch`])
-  # that match the current protected branch.
   def matching(branches)
-    branches.select { |branch| self.matches?(branch.name) }
+    ref_matcher.matching(branches)
   end
 
-  # Checks if the protected branch matches the given branch name.
   def matches?(branch_name)
-    return false if self.name.blank?
-
-    exact_match?(branch_name) || wildcard_match?(branch_name)
+    ref_matcher.matches?(branch_name)
   end
 
-  # Checks if this protected branch contains a wildcard
   def wildcard?
-    self.name && self.name.include?('*')
+    ref_matcher.wildcard?
   end
 
-  protected
-
-  def exact_match?(branch_name)
-    self.name == branch_name
-  end
-
-  def wildcard_match?(branch_name)
-    wildcard_regex === branch_name
-  end
+  private
 
-  def wildcard_regex
-    @wildcard_regex ||= begin
-      name = self.name.gsub('*', 'STAR_DONT_ESCAPE')
-      quoted_name = Regexp.quote(name)
-      regex_string = quoted_name.gsub('STAR_DONT_ESCAPE', '.*?')
-      /\A#{regex_string}\z/
-    end
+  def ref_matcher
+    @ref_matcher ||= ProtectedRefMatcher.new(self)
   end
 end
diff --git a/app/models/protected_ref_matcher.rb b/app/models/protected_ref_matcher.rb
new file mode 100644
index 00000000000..83f44240259
--- /dev/null
+++ b/app/models/protected_ref_matcher.rb
@@ -0,0 +1,52 @@
+class ProtectedRefMatcher
+  def initialize(protected_ref)
+    @protected_ref = protected_ref
+  end
+
+  # Returns all protected refs that match the given ref name.
+  # This realizes all records from the scope built up so far, and does
+  # _not_ return a relation.
+  #
+  # This method optionally takes in a list of `protected_refs` to search
+  # through, to avoid calling out to the database.
+  def self.matching(type, ref_name, protected_refs: nil)
+    (protected_refs || type.all).select { |protected_ref| protected_ref.matches?(ref_name) }
+  end
+
+  # Returns all branches/tags (among the given list of refs [`Gitlab::Git::Branch`])
+  # that match the current protected ref.
+  def matching(refs)
+    refs.select { |ref| @protected_ref.matches?(ref.name) }
+  end
+
+  # Checks if the protected ref matches the given ref name.
+  def matches?(ref_name)
+    return false if @protected_ref.name.blank?
+
+    exact_match?(ref_name) || wildcard_match?(ref_name)
+  end
+
+  # Checks if this protected ref contains a wildcard
+  def wildcard?
+    @protected_ref.name && @protected_ref.name.include?('*')
+  end
+
+  protected
+
+  def exact_match?(ref_name)
+    @protected_ref.name == ref_name
+  end
+
+  def wildcard_match?(ref_name)
+    wildcard_regex === ref_name
+  end
+
+  def wildcard_regex
+    @wildcard_regex ||= begin
+      name = @protected_ref.name.gsub('*', 'STAR_DONT_ESCAPE')
+      quoted_name = Regexp.quote(name)
+      regex_string = quoted_name.gsub('STAR_DONT_ESCAPE', '.*?')
+      /\A#{regex_string}\z/
+    end
+  end
+end
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
new file mode 100644
index 00000000000..d307549aa49
--- /dev/null
+++ b/app/models/protected_tag.rb
@@ -0,0 +1,39 @@
+class ProtectedTag < ActiveRecord::Base
+  include Gitlab::ShellAdapter
+
+  belongs_to :project
+  validates :name, presence: true
+  validates :project, presence: true
+
+  has_many :push_access_levels, dependent: :destroy
+
+  validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
+
+  accepts_nested_attributes_for :push_access_levels
+
+  def commit
+    project.commit(self.name)
+  end
+
+  def self.matching(tag_name, protected_tags: nil)
+    ProtectedRefMatcher.matching(ProtectedTag, tag_name, protected_refs: protected_tags)
+  end
+
+  def matching(branches)
+    ref_matcher.matching(branches)
+  end
+
+  def matches?(tag_name)
+    ref_matcher.matches?(tag_name)
+  end
+
+  def wildcard?
+    ref_matcher.wildcard?
+  end
+
+  private
+
+  def ref_matcher
+    @ref_matcher ||= ProtectedRefMatcher.new(self)
+  end
+end
diff --git a/app/models/protected_tag/push_access_level.rb b/app/models/protected_tag/push_access_level.rb
new file mode 100644
index 00000000000..9282af841ce
--- /dev/null
+++ b/app/models/protected_tag/push_access_level.rb
@@ -0,0 +1,21 @@
+class ProtectedTag::PushAccessLevel < ActiveRecord::Base
+  include ProtectedTagAccess
+
+  validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
+                                                             Gitlab::Access::DEVELOPER,
+                                                             Gitlab::Access::NO_ACCESS] }
+
+  def self.human_access_levels
+    {
+      Gitlab::Access::MASTER => "Masters",
+      Gitlab::Access::DEVELOPER => "Developers + Masters",
+      Gitlab::Access::NO_ACCESS => "No one"
+    }.with_indifferent_access
+  end
+
+  def check_access(user)
+    return false if access_level == Gitlab::Access::NO_ACCESS
+
+    super
+  end
+end
diff --git a/app/services/protected_tags/create_service.rb b/app/services/protected_tags/create_service.rb
new file mode 100644
index 00000000000..faba7865a17
--- /dev/null
+++ b/app/services/protected_tags/create_service.rb
@@ -0,0 +1,11 @@
+module ProtectedTags
+  class CreateService < BaseService
+    attr_reader :protected_tag
+
+    def execute
+      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
+
+      project.protected_tags.create(params)
+    end
+  end
+end
diff --git a/app/services/protected_tags/update_service.rb b/app/services/protected_tags/update_service.rb
new file mode 100644
index 00000000000..8a2419efd7b
--- /dev/null
+++ b/app/services/protected_tags/update_service.rb
@@ -0,0 +1,13 @@
+module ProtectedTags
+  class UpdateService < BaseService
+    attr_reader :protected_tag
+
+    def execute(protected_tag)
+      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
+
+      @protected_tag = protected_tag
+      @protected_tag.update(params)
+      @protected_tag
+    end
+  end
+end
-- 
cgit v1.2.1


From f51eac1df967856299467f65ac6fb81e2d610ff5 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 17 Mar 2017 19:55:15 +0000
Subject: Settings::RepositoryController includes protected tags in JS

---
 .../projects/settings/repository_controller.rb     | 30 +++++++++++++++-----
 app/models/concerns/protected_ref_access.rb        | 32 +++++++++++-----------
 app/models/project.rb                              |  1 +
 3 files changed, 40 insertions(+), 23 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index b6ce4abca45..5160ee5e1e4 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -7,22 +7,23 @@ module Projects
         @deploy_keys = DeployKeysPresenter
           .new(@project, current_user: current_user)
 
-        define_protected_branches
+        define_protected_refs
       end
 
       private
 
-      def define_protected_branches
-        load_protected_branches
+      def define_protected_refs
+        @protected_branches = @project.protected_branches.order(:name).page(params[:page])
+        @protected_tags = @project.protected_tags.order(:name).page(params[:page])
         @protected_branch = @project.protected_branches.new
+        @protected_tag = @project.protected_tags.new
         load_gon_index
       end
 
-      def load_protected_branches
-        @protected_branches = @project.protected_branches.order(:name).page(params[:page])
-      end
 
       def access_levels_options
+        #TODO: consider protected tags
+        #TODO: Refactor ProtectedBranch::PushAccessLevel so it doesn't mention branches
         {
           push_access_levels: {
             roles: ProtectedBranch::PushAccessLevel.human_access_levels.map do |id, text|
@@ -37,13 +38,28 @@ module Projects
         }
       end
 
+      #TODO: Move to Protections::TagMatcher.new(project).unprotected
+      def unprotected_tags
+        exact_protected_tag_names = @project.protected_tags.reject(&:wildcard?).map(&:name)
+        tag_names = @project.repository.tags.map(&:name)
+        non_open_tag_names = Set.new(exact_protected_tag_names).intersection(Set.new(tag_names))
+        @project.repository.tags.reject { |tag| non_open_tag_names.include? tag.name }
+      end
+
+      def unprotected_tags_hash
+        tags = unprotected_tags.map { |tag| { text: tag.name, id: tag.name, title: tag.name } }
+        { open_tags: tags }
+      end
+
       def open_branches
         branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
         { open_branches: branches }
       end
 
       def load_gon_index
-        gon.push(open_branches.merge(access_levels_options))
+        gon.push(open_branches)
+        gon.push(unprotected_tags_hash)
+        gon.push(access_levels_options)
       end
     end
   end
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
index 9dd4d9c6f24..2870cd9385b 100644
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -1,21 +1,21 @@
-module ProtectedBranchAccess
-  extend ActiveSupport::Concern
+# module ProtectedRefAccess
+#   extend ActiveSupport::Concern
 
-  included do
-    belongs_to :protected_branch
-    delegate :project, to: :protected_branch
+#   included do
+#     # belongs_to :protected_branch
+#     # delegate :project, to: :protected_branch
 
-    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
-    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
-  end
+#     scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
+#     scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+#   end
 
-  def humanize
-    self.class.human_access_levels[self.access_level]
-  end
+#   def humanize
+#     self.class.human_access_levels[self.access_level]
+#   end
 
-  def check_access(user)
-    return true if user.is_admin?
+#   def check_access(user)
+#     return true if user.is_admin?
 
-    project.team.max_member_access(user.id) >= access_level
-  end
-end
+#     project.team.max_member_access(user.id) >= access_level
+#   end
+# end
diff --git a/app/models/project.rb b/app/models/project.rb
index 3f1a8a1a1e1..c04effc53bd 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -866,6 +866,7 @@ class Project < ActiveRecord::Base
   end
 
   # Branches that are not _exactly_ matched by a protected branch.
+  #TODO: Move to Protections::BranchMatcher.new(project).unprotecte
   def open_branches
     exact_protected_branch_names = protected_branches.reject(&:wildcard?).map(&:name)
     branch_names = repository.branches.map(&:name)
-- 
cgit v1.2.1


From 18b445ade4280c03e73ccbf2ca4d175e97a887c8 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Thu, 30 Mar 2017 23:35:19 +0100
Subject: Protected tags can be added/listed via UI

---
 .../protected_tags/protected_tag_dropdown.js       |  4 +--
 .../protected_tags/_create_protected_tag.html.haml |  4 +--
 app/views/projects/protected_tags/_index.html.haml |  2 +-
 .../protected_tags/_protected_tag.html.haml        | 21 +++++++++++++++
 .../projects/protected_tags/_tags_list.html.haml   | 30 ++++++++++++++++++----
 .../protected_tags/_update_protected_tag.haml      |  5 ++++
 6 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 app/views/projects/protected_tags/_protected_tag.html.haml
 create mode 100644 app/views/projects/protected_tags/_update_protected_tag.haml

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
index 5a0356f502c..ccc4c81fa18 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -53,9 +53,9 @@ class ProtectedTagDropdown {
 
   getProtectedTags(term, callback) {
     if (this.selectedTag) {
-      callback(gon.open_branches.concat(this.selectedTag));
+      callback(gon.open_tags.concat(this.selectedTag));
     } else {
-      callback(gon.open_branches);
+      callback(gon.open_tags);
     }
   }
 
diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index 110c24ac9e4..9fdebf2c982 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -1,11 +1,11 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @protected_branch], html: { class: 'new_protected_tag' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'new_protected_tag' } do |f|
   .panel.panel-default
     .panel-heading
       %h3.panel-title
         Protect a tag
     .panel-body
       .form-horizontal
-        = form_errors(@protected_branch)
+        = form_errors(@protected_tag)
         .form-group
           = f.label :name, class: 'col-md-2 text-right' do
             Tag:
diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
index 0965bf75eae..591d64ae7de 100644
--- a/app/views/projects/protected_tags/_index.html.haml
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -6,7 +6,7 @@
     %h4.prepend-top-0
       Protected tags
     %p.prepend-top-20
-      By default, Protected branches are designed to:
+      By default, Protected tags are designed to:
       %ul
         %li Prevent tag pushes from everybody except Masters
         %li Prevent <strong>anyone</strong> from force pushing to the tag
diff --git a/app/views/projects/protected_tags/_protected_tag.html.haml b/app/views/projects/protected_tags/_protected_tag.html.haml
new file mode 100644
index 00000000000..26bd3a1f5ed
--- /dev/null
+++ b/app/views/projects/protected_tags/_protected_tag.html.haml
@@ -0,0 +1,21 @@
+%tr.js-protected-tag-edit-form{ data: { url: namespace_project_protected_tag_path(@project.namespace, @project, protected_tag) } }
+  %td
+    = protected_tag.name
+    - if @project.root_ref?(protected_tag.name)
+      %span.label.label-info.prepend-left-5 default
+  %td
+    - if protected_tag.wildcard?
+      - matching_tags = protected_tag.matching(repository.tags)
+      = link_to pluralize(matching_tags.count, "matching tag"), namespace_project_protected_tag_path(@project.namespace, @project, protected_tag)
+    - else
+      - if commit = protected_tag.commit
+        = link_to(commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id')
+        = time_ago_with_tooltip(commit.committed_date)
+      - else
+        (tag was removed from repository)
+
+  = render partial: 'projects/protected_tags/update_protected_tag', locals: { protected_tag: protected_tag }
+
+  - if can_admin_project
+    %td
+      = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_tag], data: { confirm: 'tag will be writable for developers. Are you sure?' }, method: :delete, class: 'btn btn-warning'
diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml
index e7ce90393e9..6dcd356e6f1 100644
--- a/app/views/projects/protected_tags/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/_tags_list.html.haml
@@ -1,6 +1,26 @@
 .panel.panel-default.protected-tags-list
-  .panel-heading
-    %h3.panel-title
-      Protected tag (0)
-  %p.settings-message.text-center
-    There are currently no protected tags, protect a tag with the form above.
+  - if @protected_tags.empty?
+    .panel-heading
+      %h3.panel-title
+        Protected tag (#{@protected_tags.size})
+    %p.settings-message.text-center
+      There are currently no protected tags, protect a tag with the form above.
+  - else
+    - can_admin_project = can?(current_user, :admin_project, @project)
+
+    %table.table.table-bordered
+      %colgroup
+        %col{ width: "25%" }
+        %col{ width: "55%" }
+        %col{ width: "20%" }
+      %thead
+        %tr
+          %th Protected tag (#{@protected_tags.size})
+          %th Last commit
+          %th Allowed to push
+          - if can_admin_project
+            %th
+      %tbody
+        = render partial: 'projects/protected_tags/protected_tag', collection: @protected_tags, locals: { can_admin_project: can_admin_project}
+
+    = paginate @protected_tags, theme: 'gitlab'
diff --git a/app/views/projects/protected_tags/_update_protected_tag.haml b/app/views/projects/protected_tags/_update_protected_tag.haml
new file mode 100644
index 00000000000..729a784a559
--- /dev/null
+++ b/app/views/projects/protected_tags/_update_protected_tag.haml
@@ -0,0 +1,5 @@
+%td
+  = hidden_field_tag "allowed_to_push_#{protected_tag.id}", protected_tag.push_access_levels.first.access_level
+  / = dropdown_tag( (protected_tag.push_access_levels.first.humanize || 'Select') ,
+  /                options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container',
+  /                data: { field_name: "allowed_to_push_#{protected_tag.id}", access_level_id: protected_tag.push_access_levels.first.id }})
-- 
cgit v1.2.1


From e3fbcd0093b07bbc084061992bb8ae6bd4343d52 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 31 Mar 2017 17:57:29 +0100
Subject: Protected Tags enforced over git

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

(limited to 'app')

diff --git a/app/models/project.rb b/app/models/project.rb
index c04effc53bd..7681da36335 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -893,6 +893,7 @@ class Project < ActiveRecord::Base
   end
 
   # Check if current branch name is marked as protected in the system
+  #TODO: Move elsewhere
   def protected_branch?(branch_name)
     return true if empty_repo? && default_branch_protected?
 
@@ -900,6 +901,13 @@ class Project < ActiveRecord::Base
     ProtectedBranch.matching(branch_name, protected_branches: @protected_branches).present?
   end
 
+  #TODO: Move elsewhere
+  def protected_tag?(tag_name)
+    #TODO: Check if memoization necessary, find way to have it work elsewhere
+    @protected_tags ||= self.protected_tags.to_a
+    ProtectedTag.matching(tag_name, protected_tags: @protected_tags).present?
+  end
+
   def user_can_push_to_empty_repo?(user)
     !default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
   end
-- 
cgit v1.2.1


From ab46353fd9c0c76c137bf828788ecbc34d0fe99a Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 31 Mar 2017 19:29:25 +0100
Subject: Added ProtectedTags#show page

Uncommented protected tags feature specs copied from protected branches
---
 .../protected_tags/_matching_tag.html.haml         |  9 ++++++++
 app/views/projects/protected_tags/show.html.haml   | 25 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 app/views/projects/protected_tags/_matching_tag.html.haml
 create mode 100644 app/views/projects/protected_tags/show.html.haml

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_matching_tag.html.haml b/app/views/projects/protected_tags/_matching_tag.html.haml
new file mode 100644
index 00000000000..97e5cd6f9d2
--- /dev/null
+++ b/app/views/projects/protected_tags/_matching_tag.html.haml
@@ -0,0 +1,9 @@
+%tr
+  %td
+    = link_to matching_tag.name, namespace_project_tree_path(@project.namespace, @project, matching_tag.name)
+    - if @project.root_ref?(matching_tag.name)
+      %span.label.label-info.prepend-left-5 default
+  %td
+    - commit = @project.commit(matching_tag.name)
+    = link_to(commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit_short_id')
+    = time_ago_with_tooltip(commit.committed_date)
diff --git a/app/views/projects/protected_tags/show.html.haml b/app/views/projects/protected_tags/show.html.haml
new file mode 100644
index 00000000000..185807a7e8d
--- /dev/null
+++ b/app/views/projects/protected_tags/show.html.haml
@@ -0,0 +1,25 @@
+- page_title @protected_tag.name, "Protected Tags"
+
+.row.prepend-top-default.append-bottom-default
+  .col-lg-3
+    %h4.prepend-top-0
+      = @protected_tag.name
+
+  .col-lg-9
+    %h5 Matching Tags
+    - if @matching_tags.present?
+      .table-responsive
+        %table.table.protected-tags-list
+          %colgroup
+            %col{ width: "30%" }
+            %col{ width: "30%" }
+          %thead
+            %tr
+              %th Tag
+              %th Last commit
+          %tbody
+            - @matching_tags.each do |matching_tag|
+              = render partial: "matching_tag", object: matching_tag
+    - else
+      %p.settings-message.text-center
+        Couldn't find any matching tags.
-- 
cgit v1.2.1


From 553cf9ea54ccb0736a8b44e2f3d047d0860aa71e Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 31 Mar 2017 19:30:33 +0100
Subject: =?UTF-8?q?Added=20=E2=80=98protected=E2=80=99=20label=20and=20dis?=
 =?UTF-8?q?abled=20delete=20button=20for=20tags=20index/show?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/tags_helper.rb             | 4 ++++
 app/views/projects/tags/_tag.html.haml | 7 ++++++-
 app/views/projects/tags/show.html.haml | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index c0ec1634cdb..6672e3da348 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -21,4 +21,8 @@ module TagsHelper
 
     html.html_safe
   end
+
+  def protected_tag?(project, tag)
+    project.protected_tag?(tag.name)
+  end
 end
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index dffe908e85a..451e011a4b8 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -6,6 +6,11 @@
       %span.item-title
         = icon('tag')
         = tag.name
+
+    - if protected_tag?(@project, tag)
+      %span.label.label-success
+        protected
+
     - if tag.message.present?
       &nbsp;
       = strip_gpg_signature(tag.message)
@@ -30,5 +35,5 @@
         = icon("pencil")
 
     - if can?(current_user, :admin_project, @project)
-      = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{tag.name}' tag cannot be undone. Are you sure?", container: 'body' }, remote: true do
+      = link_to namespace_project_tag_path(@project.namespace, @project, tag.name), class: "btn btn-remove remove-row has-tooltip #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{tag.name}' tag cannot be undone. Are you sure?", container: 'body' }, remote: true do
         = icon("trash-o")
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index fad3c5c2173..1c4135c8a54 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -7,6 +7,9 @@
     .nav-text
       .title
         %span.item-title= @tag.name
+        - if protected_tag?(@project, @tag)
+          %span.label.label-success
+            protected
       - if @commit
         = render 'projects/branches/commit', commit: @commit, project: @project
       - else
@@ -24,7 +27,7 @@
         = render 'projects/buttons/download', project: @project, ref: @tag.name
       - if can?(current_user, :admin_project, @project)
         .btn-container.controls-item-full
-          = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do
+          = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: "btn btn-remove remove-row has-tooltip #{protected_tag?(@project, @tag) ? 'disabled' : ''}", title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do
             %i.fa.fa-trash-o
 
     - if @tag.message.present?
-- 
cgit v1.2.1


From 85e1fa8e21c73746bb6f6270a658453a230bb9a2 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:40:21 +0530
Subject: ProtectedTagEdit class for edit protected tags

---
 .../protected_tags/protected_tag_edit.js           | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 app/assets/javascripts/protected_tags/protected_tag_edit.js

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
new file mode 100644
index 00000000000..b93e903621e
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -0,0 +1,54 @@
+/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
+/* global Flash */
+
+(global => {
+  global.gl = global.gl || {};
+
+  gl.ProtectedTagEdit = class {
+    constructor(options) {
+      this.$wrap = options.$wrap;
+      this.$allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+
+      this.buildDropdowns();
+    }
+
+    buildDropdowns() {
+      // Allowed to push dropdown
+      new gl.ProtectedTagAccessDropdown({
+        $dropdown: this.$allowedToPushDropdown,
+        data: gon.push_access_levels,
+        onSelect: this.onSelect.bind(this)
+      });
+    }
+
+    onSelect() {
+      const $allowedToPushInput = this.$wrap.find(`input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`);
+
+      // Do not update if one dropdown has not selected any option
+      if (!$allowedToPushInput.length) return;
+
+      this.$allowedToPushDropdown.disable();
+
+      $.ajax({
+        type: 'POST',
+        url: this.$wrap.data('url'),
+        dataType: 'json',
+        data: {
+          _method: 'PATCH',
+          protected_tag: {
+            push_access_levels_attributes: [{
+              id: this.$allowedToPushDropdown.data('access-level-id'),
+              access_level: $allowedToPushInput.val()
+            }]
+          }
+        },
+        error() {
+          $.scrollTo(0);
+          new Flash('Failed to update tag!');
+        }
+      }).always(() => {
+        this.$allowedToPushDropdown.enable();
+      });
+    }
+  };
+})(window);
-- 
cgit v1.2.1


From 551dea7efe11c55799e4a0cacd9c75988ef9583b Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:40:43 +0530
Subject: Protected Tags List initializer

---
 .../protected_tags/protected_tag_edit_list.js          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/assets/javascripts/protected_tags/protected_tag_edit_list.js

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
new file mode 100644
index 00000000000..ba40c227ef4
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
@@ -0,0 +1,18 @@
+/* eslint-disable arrow-parens, no-param-reassign, no-new, comma-dangle */
+
+(global => {
+  global.gl = global.gl || {};
+
+  gl.ProtectedTagEditList = class {
+    constructor() {
+      this.$wrap = $('.protected-tags-list');
+
+      // Build edit forms
+      this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => {
+        new gl.ProtectedTagEdit({
+          $wrap: $(el)
+        });
+      });
+    }
+  };
+})(window);
-- 
cgit v1.2.1


From bbb09feaa1b535e10b20790d1857385bd34ae5f6 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:41:05 +0530
Subject: Export Protected Tags Editing classes

---
 app/assets/javascripts/protected_tags/protected_tags_bundle.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tags_bundle.js b/app/assets/javascripts/protected_tags/protected_tags_bundle.js
index d84d2e1ef70..889a8053e6f 100644
--- a/app/assets/javascripts/protected_tags/protected_tags_bundle.js
+++ b/app/assets/javascripts/protected_tags/protected_tags_bundle.js
@@ -1,3 +1,5 @@
 require('./protected_tag_access_dropdown');
 require('./protected_tag_create');
 require('./protected_tag_dropdown');
+require('./protected_tag_edit');
+require('./protected_tag_edit_list');
-- 
cgit v1.2.1


From 8d232b2f2b1b4d33741925a0baf2eaf74f52008e Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:41:28 +0530
Subject: Initialize Protected Tags Edit functionality

---
 app/assets/javascripts/dispatcher.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app')

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 6234092bdc2..d384927cc5b 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -318,9 +318,12 @@ const UserCallout = require('./user_callout');
           new Search();
           break;
         case 'projects:repository:show':
+          // Initialize Protected Branch Settings
           new gl.ProtectedBranchCreate();
           new gl.ProtectedBranchEditList();
+          // Initialize Protected Tag Settings
           new gl.ProtectedTagCreate();
+          new gl.ProtectedTagEditList();
           break;
         case 'projects:ci_cd:show':
           new gl.ProjectVariables();
-- 
cgit v1.2.1


From 48150f273d8b7cc5b042eb0a9f88b0a7a96431f4 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:42:05 +0530
Subject: Render Push levels dropdown

---
 app/views/projects/protected_tags/_update_protected_tag.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_update_protected_tag.haml b/app/views/projects/protected_tags/_update_protected_tag.haml
index 729a784a559..802a5ef3b98 100644
--- a/app/views/projects/protected_tags/_update_protected_tag.haml
+++ b/app/views/projects/protected_tags/_update_protected_tag.haml
@@ -1,5 +1,5 @@
 %td
   = hidden_field_tag "allowed_to_push_#{protected_tag.id}", protected_tag.push_access_levels.first.access_level
-  / = dropdown_tag( (protected_tag.push_access_levels.first.humanize || 'Select') ,
-  /                options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container',
-  /                data: { field_name: "allowed_to_push_#{protected_tag.id}", access_level_id: protected_tag.push_access_levels.first.id }})
+  = dropdown_tag( (protected_tag.push_access_levels.first.humanize || 'Select') ,
+                 options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container',
+                 data: { field_name: "allowed_to_push_#{protected_tag.id}", access_level_id: protected_tag.push_access_levels.first.id }})
-- 
cgit v1.2.1


From df54560f5f5d94fd9117c21d03d946d07d28f6fa Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:42:37 +0530
Subject: Increase dropdown width within Tags list

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

(limited to 'app')

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index f7ef9275560..7c93ee8af18 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -778,6 +778,12 @@ pre.light-well {
   }
 }
 
+.protected-tags-list {
+  .dropdown-menu-toggle {
+    width: 300px;
+  }
+}
+
 .custom-notifications-form {
   .is-loading {
     .custom-notification-event-loading {
-- 
cgit v1.2.1


From a7c71c7f292c9cdf892f7d33dfb52d7e16af28e6 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 3 Apr 2017 11:42:55 +0530
Subject: Update column widths

---
 app/views/projects/protected_tags/_tags_list.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml
index 6dcd356e6f1..6f63971923d 100644
--- a/app/views/projects/protected_tags/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/_tags_list.html.haml
@@ -11,8 +11,8 @@
     %table.table.table-bordered
       %colgroup
         %col{ width: "25%" }
-        %col{ width: "55%" }
-        %col{ width: "20%" }
+        %col{ width: "25%" }
+        %col{ width: "50%" }
       %thead
         %tr
           %th Protected tag (#{@protected_tags.size})
-- 
cgit v1.2.1


From 65f3d5062f081d8f8ebf727a3408650d90ec9711 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 15:17:24 +0100
Subject: Extract ProtectedRef Concern

---
 app/models/concerns/protected_ref.rb | 47 ++++++++++++++++++++++++++++++++++++
 app/models/project.rb                |  4 +--
 app/models/protected_branch.rb       | 31 +-----------------------
 app/models/protected_tag.rb          | 31 +-----------------------
 4 files changed, 51 insertions(+), 62 deletions(-)
 create mode 100644 app/models/concerns/protected_ref.rb

(limited to 'app')

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
new file mode 100644
index 00000000000..77d7b597534
--- /dev/null
+++ b/app/models/concerns/protected_ref.rb
@@ -0,0 +1,47 @@
+module ProtectedRef
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :project
+    validates :name, presence: true
+    validates :project, presence: true
+
+    def self.matching_refs_accesible_to(ref, user, action: :push)
+      access_levels_for_ref(ref, action).any? do |access_level|
+        access_level.check_access(user)
+      end
+    end
+
+    def self.access_levels_for_ref(ref, action: :push)
+      self.matching(ref).map(&:"@#{action}_access_levels").flatten
+    end
+
+    private
+
+    def self.matching(ref_name, protected_refs: nil)
+      ProtectedRefMatcher.matching(self, ref_name, protected_refs: protected_refs)
+    end
+  end
+
+  def commit
+    project.commit(self.name)
+  end
+
+  def matching(refs)
+    ref_matcher.matching(refs)
+  end
+
+  def matches?(refs)
+    ref_matcher.matches?(refs)
+  end
+
+  def wildcard?
+    ref_matcher.wildcard?
+  end
+
+  private
+
+  def ref_matcher
+    @ref_matcher ||= ProtectedRefMatcher.new(self)
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 7681da36335..970de324a5b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -898,14 +898,14 @@ class Project < ActiveRecord::Base
     return true if empty_repo? && default_branch_protected?
 
     @protected_branches ||= self.protected_branches.to_a
-    ProtectedBranch.matching(branch_name, protected_branches: @protected_branches).present?
+    ProtectedBranch.matching(branch_name, protected_refs: @protected_branches).present?
   end
 
   #TODO: Move elsewhere
   def protected_tag?(tag_name)
     #TODO: Check if memoization necessary, find way to have it work elsewhere
     @protected_tags ||= self.protected_tags.to_a
-    ProtectedTag.matching(tag_name, protected_tags: @protected_tags).present?
+    ProtectedTag.matching(tag_name, protected_refs: @protected_tags).present?
   end
 
   def user_can_push_to_empty_repo?(user)
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 7681d5b5112..a0dbcf80c3d 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -1,9 +1,6 @@
 class ProtectedBranch < ActiveRecord::Base
   include Gitlab::ShellAdapter
-
-  belongs_to :project
-  validates :name, presence: true
-  validates :project, presence: true
+  include ProtectedRef
 
   has_many :merge_access_levels, dependent: :destroy
   has_many :push_access_levels, dependent: :destroy
@@ -13,30 +10,4 @@ class ProtectedBranch < ActiveRecord::Base
 
   accepts_nested_attributes_for :push_access_levels
   accepts_nested_attributes_for :merge_access_levels
-
-  def commit
-    project.commit(self.name)
-  end
-
-  def self.matching(branch_name, protected_branches: nil)
-    ProtectedRefMatcher.matching(ProtectedBranch, branch_name, protected_refs: protected_branches)
-  end
-
-  def matching(branches)
-    ref_matcher.matching(branches)
-  end
-
-  def matches?(branch_name)
-    ref_matcher.matches?(branch_name)
-  end
-
-  def wildcard?
-    ref_matcher.wildcard?
-  end
-
-  private
-
-  def ref_matcher
-    @ref_matcher ||= ProtectedRefMatcher.new(self)
-  end
 end
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
index d307549aa49..301fe2092e9 100644
--- a/app/models/protected_tag.rb
+++ b/app/models/protected_tag.rb
@@ -1,39 +1,10 @@
 class ProtectedTag < ActiveRecord::Base
   include Gitlab::ShellAdapter
-
-  belongs_to :project
-  validates :name, presence: true
-  validates :project, presence: true
+  include ProtectedRef
 
   has_many :push_access_levels, dependent: :destroy
 
   validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
 
   accepts_nested_attributes_for :push_access_levels
-
-  def commit
-    project.commit(self.name)
-  end
-
-  def self.matching(tag_name, protected_tags: nil)
-    ProtectedRefMatcher.matching(ProtectedTag, tag_name, protected_refs: protected_tags)
-  end
-
-  def matching(branches)
-    ref_matcher.matching(branches)
-  end
-
-  def matches?(tag_name)
-    ref_matcher.matches?(tag_name)
-  end
-
-  def wildcard?
-    ref_matcher.wildcard?
-  end
-
-  private
-
-  def ref_matcher
-    @ref_matcher ||= ProtectedRefMatcher.new(self)
-  end
 end
-- 
cgit v1.2.1


From b8c7bef5c092152ea85d1840e587cfc04293e1d7 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 17:10:58 +0100
Subject: Extracted ProtectableDropdown to clean up Project#open_branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Makes it clear this is only used in dropdowns, instead of cluttering up Project class. Since we only care about branch names, it is also possible to refactor out a lot of the set/reject logic.

A benchmark on Array/Set subtraction favoured using Arrays. This was with 5000 ‘branches’ and 2000 ‘protections’ to ensure a similar comparison to the commit which introduced using Set for intersection.

Comparison:
   array subtraction:      485.8 i/s
     set subtraction:      128.7 i/s - 3.78x slower
---
 .../projects/settings/repository_controller.rb     | 25 ++++++---------------
 app/models/project.rb                              |  9 --------
 app/models/protectable_dropdown.rb                 | 26 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 app/models/protectable_dropdown.rb

(limited to 'app')

diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index 5160ee5e1e4..a87927fe1ec 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -4,8 +4,7 @@ module Projects
       before_action :authorize_admin_project!
 
       def show
-        @deploy_keys = DeployKeysPresenter
-          .new(@project, current_user: current_user)
+        @deploy_keys = DeployKeysPresenter.new(@project, current_user: current_user)
 
         define_protected_refs
       end
@@ -38,27 +37,17 @@ module Projects
         }
       end
 
-      #TODO: Move to Protections::TagMatcher.new(project).unprotected
-      def unprotected_tags
-        exact_protected_tag_names = @project.protected_tags.reject(&:wildcard?).map(&:name)
-        tag_names = @project.repository.tags.map(&:name)
-        non_open_tag_names = Set.new(exact_protected_tag_names).intersection(Set.new(tag_names))
-        @project.repository.tags.reject { |tag| non_open_tag_names.include? tag.name }
+      def protectable_tags_for_dropdown
+        { open_tags: ProtectableDropdown.new(@project, :tags).hash }
       end
 
-      def unprotected_tags_hash
-        tags = unprotected_tags.map { |tag| { text: tag.name, id: tag.name, title: tag.name } }
-        { open_tags: tags }
-      end
-
-      def open_branches
-        branches = @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } }
-        { open_branches: branches }
+      def protectable_branches_for_dropdown
+        { open_branches: ProtectableDropdown.new(@project, :branches).hash }
       end
 
       def load_gon_index
-        gon.push(open_branches)
-        gon.push(unprotected_tags_hash)
+        gon.push(protectable_tags_for_dropdown)
+        gon.push(protectable_branches_for_dropdown)
         gon.push(access_levels_options)
       end
     end
diff --git a/app/models/project.rb b/app/models/project.rb
index 970de324a5b..4175bfab0a9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -865,15 +865,6 @@ class Project < ActiveRecord::Base
     @repo_exists = false
   end
 
-  # Branches that are not _exactly_ matched by a protected branch.
-  #TODO: Move to Protections::BranchMatcher.new(project).unprotecte
-  def open_branches
-    exact_protected_branch_names = protected_branches.reject(&:wildcard?).map(&:name)
-    branch_names = repository.branches.map(&:name)
-    non_open_branch_names = Set.new(exact_protected_branch_names).intersection(Set.new(branch_names))
-    repository.branches.reject { |branch| non_open_branch_names.include? branch.name }
-  end
-
   def root_ref?(branch)
     repository.root_ref == branch
   end
diff --git a/app/models/protectable_dropdown.rb b/app/models/protectable_dropdown.rb
new file mode 100644
index 00000000000..c9b2b213cd2
--- /dev/null
+++ b/app/models/protectable_dropdown.rb
@@ -0,0 +1,26 @@
+class ProtectableDropdown
+  def initialize(project, ref_type)
+    @project = project
+    @ref_type = ref_type
+  end
+
+  # Tags/branches which are yet to be individually protected
+  def protectable_ref_names
+    non_wildcard_protections = protections.reject(&:wildcard?)
+    refs.map(&:name) - non_wildcard_protections.map(&:name)
+  end
+
+  def hash
+    protectable_ref_names.map { |ref_name| { text: ref_name, id: ref_name, title: ref_name } }
+  end
+
+  private
+
+  def refs
+    @project.repository.public_send(@ref_type)
+  end
+
+  def protections
+    @project.public_send("protected_#{@ref_type}")
+  end
+end
-- 
cgit v1.2.1


From bf3cc824e4ce6cf49a82210eaaf1cca06f7fd281 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 18:59:58 +0100
Subject: Moved Project#protected_branch? to ProtectedBranch, similar for tags

---
 app/helpers/branches_helper.rb                |  2 +-
 app/helpers/tags_helper.rb                    |  2 +-
 app/models/merge_request.rb                   |  2 +-
 app/models/project.rb                         | 22 +++++++++++-----------
 app/models/protected_branch.rb                |  8 ++++++++
 app/models/protected_tag.rb                   |  5 +++++
 app/services/delete_branch_service.rb         |  2 +-
 app/services/git_push_service.rb              |  2 +-
 app/views/projects/branches/_branch.html.haml |  2 +-
 9 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'app')

diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index 3fc85dc6b2b..a852b90c57e 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -1,6 +1,6 @@
 module BranchesHelper
   def can_remove_branch?(project, branch_name)
-    if project.protected_branch? branch_name
+    if ProtectedBranch.protected?(project, branch_name)
       false
     elsif branch_name == project.repository.root_ref
       false
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 6672e3da348..31aaf9e5607 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -23,6 +23,6 @@ module TagsHelper
   end
 
   def protected_tag?(project, tag)
-    project.protected_tag?(tag.name)
+    ProtectedTag.protected?(project, tag.name)
   end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index cef8ad76b07..38eefad96b6 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -442,7 +442,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def can_remove_source_branch?(current_user)
-    !source_project.protected_branch?(source_branch) &&
+    !ProtectedBranch.protected?(source_project, source_branch) &&
       !source_project.root_ref?(source_branch) &&
       Ability.allowed?(current_user, :push_code, source_project) &&
       diff_head_commit == source_branch_head
diff --git a/app/models/project.rb b/app/models/project.rb
index 4175bfab0a9..5cc224b4440 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -883,20 +883,19 @@ class Project < ActiveRecord::Base
     "#{url}.git"
   end
 
-  # Check if current branch name is marked as protected in the system
-  #TODO: Move elsewhere
-  def protected_branch?(branch_name)
-    return true if empty_repo? && default_branch_protected?
 
-    @protected_branches ||= self.protected_branches.to_a
-    ProtectedBranch.matching(branch_name, protected_refs: @protected_branches).present?
+  def empty_and_default_branch_protected?
+    empty_repo? && default_branch_protected?
   end
 
-  #TODO: Move elsewhere
-  def protected_tag?(tag_name)
-    #TODO: Check if memoization necessary, find way to have it work elsewhere
-    @protected_tags ||= self.protected_tags.to_a
-    ProtectedTag.matching(tag_name, protected_refs: @protected_tags).present?
+  #TODO: Check with if this is still needed, maybe because of `.select {` in ProtectedRefsMatcher
+  #Either with tests or by asking Tim
+  def protected_tags_array
+    @protected_tags_array ||= self.protected_tags.to_a
+  end
+
+  def protected_branches_array
+    @protected_branches_array ||= self.protected_branches.to_a
   end
 
   def user_can_push_to_empty_repo?(user)
@@ -1367,6 +1366,7 @@ class Project < ActiveRecord::Base
     "projects/#{id}/pushes_since_gc"
   end
 
+  #TODO: Move this and methods which depend upon it
   def default_branch_protected?
     current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_FULL ||
       current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index a0dbcf80c3d..eca8d5e0f7d 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -10,4 +10,12 @@ class ProtectedBranch < ActiveRecord::Base
 
   accepts_nested_attributes_for :push_access_levels
   accepts_nested_attributes_for :merge_access_levels
+
+  # Check if branch name is marked as protected in the system
+  def self.protected?(project, ref_name)
+    return true if project.empty_and_default_branch_protected?
+
+    protected_refs = project.protected_branches_array
+    self.matching(ref_name, protected_refs: protected_refs).present?
+  end
 end
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
index 301fe2092e9..bca5522759d 100644
--- a/app/models/protected_tag.rb
+++ b/app/models/protected_tag.rb
@@ -7,4 +7,9 @@ class ProtectedTag < ActiveRecord::Base
   validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
 
   accepts_nested_attributes_for :push_access_levels
+
+  def self.protected?(project, ref_name)
+    protected_refs = project.protected_tags_array
+    self.matching(ref_name, protected_refs: protected_refs).present?
+  end
 end
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index 11a045f4c31..38a113caec7 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -11,7 +11,7 @@ class DeleteBranchService < BaseService
       return error('Cannot remove HEAD branch', 405)
     end
 
-    if project.protected_branch?(branch_name)
+    if ProtectedBranch.protected?(project, branch_name)
       return error('Protected branch cant be removed', 405)
     end
 
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index bc7431c89a8..45411c779cc 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -127,7 +127,7 @@ class GitPushService < BaseService
     project.change_head(branch_name)
 
     # Set protection on the default branch if configured
-    if current_application_settings.default_branch_protection != PROTECTION_NONE && !@project.protected_branch?(@project.default_branch)
+    if current_application_settings.default_branch_protection != PROTECTION_NONE && !ProtectedBranch.protected?(@project, @project.default_branch)
 
       params = {
         name: @project.default_branch,
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 9eb610ba9c0..d84fa9e55c0 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -15,7 +15,7 @@
       %span.label.label-info.has-tooltip{ title: "Merged into #{@repository.root_ref}" }
         merged
 
-    - if @project.protected_branch? branch.name
+    - if ProtectedBranch.protected?(@project, branch.name)
       %span.label.label-success
         protected
     .controls.hidden-xs<
-- 
cgit v1.2.1


From 4f71c29c8bb35642ed5d26015619fc3f838f5e56 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 19:28:54 +0100
Subject: Moved default_branch_protected? out of Project

---
 app/models/project.rb          | 13 +------------
 app/models/protected_branch.rb |  7 ++++++-
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/models/project.rb b/app/models/project.rb
index 5cc224b4440..fdb0a679e28 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -883,11 +883,6 @@ class Project < ActiveRecord::Base
     "#{url}.git"
   end
 
-
-  def empty_and_default_branch_protected?
-    empty_repo? && default_branch_protected?
-  end
-
   #TODO: Check with if this is still needed, maybe because of `.select {` in ProtectedRefsMatcher
   #Either with tests or by asking Tim
   def protected_tags_array
@@ -899,7 +894,7 @@ class Project < ActiveRecord::Base
   end
 
   def user_can_push_to_empty_repo?(user)
-    !default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
+    !ProtectedBranch.default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
   end
 
   def forked?
@@ -1366,12 +1361,6 @@ class Project < ActiveRecord::Base
     "projects/#{id}/pushes_since_gc"
   end
 
-  #TODO: Move this and methods which depend upon it
-  def default_branch_protected?
-    current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_FULL ||
-      current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
-  end
-
   # Similar to the normal callbacks that hook into the life cycle of an
   # Active Record object, you can also define callbacks that get triggered
   # when you add an object to an association collection. If any of these
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index eca8d5e0f7d..0f0ac18b1a3 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -13,9 +13,14 @@ class ProtectedBranch < ActiveRecord::Base
 
   # Check if branch name is marked as protected in the system
   def self.protected?(project, ref_name)
-    return true if project.empty_and_default_branch_protected?
+    return true if project.empty_repo? && default_branch_protected?
 
     protected_refs = project.protected_branches_array
     self.matching(ref_name, protected_refs: protected_refs).present?
   end
+
+  def self.default_branch_protected?
+    current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_FULL ||
+      current_application_settings.default_branch_protection == Gitlab::Access::PROTECTION_DEV_CAN_MERGE
+  end
 end
-- 
cgit v1.2.1


From 04a50bd9515e09d047d6f678c5d9485f89b31df7 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 19:47:08 +0100
Subject: Removed protected_tags_array
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This memorized array appears to originally come from https://gitlab.com/gitlab-org/gitlab-ee/commit/19c2c90ccac86a21eb4266b9a5972162f917f692 which has a commit message of ‘fix warnings’. Without any comments on the original pull request I think we can safely get rid of it unless warnings re-appear.
---
 app/models/project.rb          | 10 ----------
 app/models/protected_branch.rb |  3 +--
 app/models/protected_tag.rb    |  3 +--
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/models/project.rb b/app/models/project.rb
index fdb0a679e28..13c5c181cc5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -883,16 +883,6 @@ class Project < ActiveRecord::Base
     "#{url}.git"
   end
 
-  #TODO: Check with if this is still needed, maybe because of `.select {` in ProtectedRefsMatcher
-  #Either with tests or by asking Tim
-  def protected_tags_array
-    @protected_tags_array ||= self.protected_tags.to_a
-  end
-
-  def protected_branches_array
-    @protected_branches_array ||= self.protected_branches.to_a
-  end
-
   def user_can_push_to_empty_repo?(user)
     !ProtectedBranch.default_branch_protected? || team.max_member_access(user.id) > Gitlab::Access::DEVELOPER
   end
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 0f0ac18b1a3..28b7d5ad072 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -15,8 +15,7 @@ class ProtectedBranch < ActiveRecord::Base
   def self.protected?(project, ref_name)
     return true if project.empty_repo? && default_branch_protected?
 
-    protected_refs = project.protected_branches_array
-    self.matching(ref_name, protected_refs: protected_refs).present?
+    self.matching(ref_name, protected_refs: project.protected_branches).present?
   end
 
   def self.default_branch_protected?
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
index bca5522759d..a52fe90bb2b 100644
--- a/app/models/protected_tag.rb
+++ b/app/models/protected_tag.rb
@@ -9,7 +9,6 @@ class ProtectedTag < ActiveRecord::Base
   accepts_nested_attributes_for :push_access_levels
 
   def self.protected?(project, ref_name)
-    protected_refs = project.protected_tags_array
-    self.matching(ref_name, protected_refs: protected_refs).present?
+    self.matching(ref_name, protected_refs: project.protected_tags).present?
   end
 end
-- 
cgit v1.2.1


From 35b719f60b21fbd09a1a2b4dc0d3f1e3e74e89e1 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 19:48:00 +0100
Subject: Use delegation in ProtectedRef concern

---
 app/models/concerns/protected_ref.rb | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index 77d7b597534..4f3500d998a 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -6,6 +6,8 @@ module ProtectedRef
     validates :name, presence: true
     validates :project, presence: true
 
+    delegate :matching, :matches?, :wildcard?, to: :ref_matcher
+
     def self.matching_refs_accesible_to(ref, user, action: :push)
       access_levels_for_ref(ref, action).any? do |access_level|
         access_level.check_access(user)
@@ -27,18 +29,6 @@ module ProtectedRef
     project.commit(self.name)
   end
 
-  def matching(refs)
-    ref_matcher.matching(refs)
-  end
-
-  def matches?(refs)
-    ref_matcher.matches?(refs)
-  end
-
-  def wildcard?
-    ref_matcher.wildcard?
-  end
-
   private
 
   def ref_matcher
-- 
cgit v1.2.1


From 9f4b8dba805915bd21d315f159035449f9f4bef0 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 20:06:06 +0100
Subject: Clean up non TODO rubocop errors

---
 app/controllers/projects/settings/repository_controller.rb | 2 +-
 app/models/concerns/protected_ref.rb                       | 2 --
 app/models/concerns/protected_ref_access.rb                | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index a87927fe1ec..fb175b4a636 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -13,7 +13,7 @@ module Projects
 
       def define_protected_refs
         @protected_branches = @project.protected_branches.order(:name).page(params[:page])
-        @protected_tags = @project.protected_tags.order(:name).page(params[:page])
+        @protected_tags = @project.protected_tags.order(:name).page(params[:page]) #TODO duplicated pagination param?
         @protected_branch = @project.protected_branches.new
         @protected_tag = @project.protected_tags.new
         load_gon_index
diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index 4f3500d998a..3681ae63e3a 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -18,8 +18,6 @@ module ProtectedRef
       self.matching(ref).map(&:"@#{action}_access_levels").flatten
     end
 
-    private
-
     def self.matching(ref_name, protected_refs: nil)
       ProtectedRefMatcher.matching(self, ref_name, protected_refs: protected_refs)
     end
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
index 2870cd9385b..08377127f69 100644
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -1,3 +1,4 @@
+#TODO: Refactor, checking EE
 # module ProtectedRefAccess
 #   extend ActiveSupport::Concern
 
-- 
cgit v1.2.1


From 3c91841d032f02b0b0d4c532998bbc923247e804 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 21:00:51 +0100
Subject: Created ProtectedRefsController to reduce Tags/Branches duplication

Fixes ProtectedBranches#create flash errors bug due to
typo in 'flash[:alert] = @protected_branches.errors'
---
 .../projects/protected_branches_controller.rb      | 58 +++++++---------------
 .../projects/protected_refs_controller.rb          | 48 ++++++++++++++++++
 .../projects/protected_tags_controller.rb          | 58 +++++++---------------
 3 files changed, 84 insertions(+), 80 deletions(-)
 create mode 100644 app/controllers/projects/protected_refs_controller.rb

(limited to 'app')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index a8cb07eb67a..a245a60910e 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,58 +1,36 @@
-class Projects::ProtectedBranchesController < Projects::ApplicationController
-  include RepositorySettingsRedirect
-  # Authorize
-  before_action :require_non_empty_project
-  before_action :authorize_admin_project!
-  before_action :load_protected_branch, only: [:show, :update, :destroy]
+class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
 
-  layout "project_settings"
+  protected
 
-  def index
-    redirect_to_repository_settings(@project)
+  def protected_ref
+    @protected_branch
   end
 
-  def create
-    @protected_branch = ::ProtectedBranches::CreateService.new(@project, current_user, protected_branch_params).execute
-    unless @protected_branch.persisted?
-      flash[:alert] = @protected_branches.errors.full_messages.join(', ').html_safe
-    end
-    redirect_to_repository_settings(@project)
+  def protected_ref=(val)
+    @protected_branch = val
   end
 
-  def show
-    @matching_branches = @protected_branch.matching(@project.repository.branches)
+  def matching_refs=(val)
+    @matching_branches = val
   end
 
-  def update
-    @protected_branch = ::ProtectedBranches::UpdateService.new(@project, current_user, protected_branch_params).execute(@protected_branch)
-
-    if @protected_branch.valid?
-      respond_to do |format|
-        format.json { render json: @protected_branch, status: :ok }
-      end
-    else
-      respond_to do |format|
-        format.json { render json: @protected_branch.errors, status: :unprocessable_entity }
-      end
-    end
+  def project_refs
+    @project.repository.branches
   end
 
-  def destroy
-    @protected_branch.destroy
-
-    respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
-      format.js { head :ok }
-    end
+  def create_service
+    ::ProtectedBranches::CreateService
   end
 
-  private
+  def update_service
+    ::ProtectedBranches::UpdateService
+  end
 
-  def load_protected_branch
-    @protected_branch = @project.protected_branches.find(params[:id])
+  def load_protected_ref
+    self.protected_ref = @project.protected_branches.find(params[:id])
   end
 
-  def protected_branch_params
+  def protected_ref_params
     params.require(:protected_branch).permit(:name,
                                              merge_access_levels_attributes: [:access_level, :id],
                                              push_access_levels_attributes: [:access_level, :id])
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
new file mode 100644
index 00000000000..63f005124a9
--- /dev/null
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -0,0 +1,48 @@
+class Projects::ProtectedRefsController < Projects::ApplicationController
+  include RepositorySettingsRedirect
+  # Authorize
+  before_action :require_non_empty_project
+  before_action :authorize_admin_project!
+  before_action :load_protected_ref, only: [:show, :update, :destroy]
+
+  layout "project_settings"
+
+  def index
+    redirect_to_repository_settings(@project)
+  end
+
+  def create
+    self.protected_ref = create_service.new(@project, current_user, protected_ref_params).execute
+    unless protected_ref.persisted?
+      flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
+    end
+    redirect_to_repository_settings(@project)
+  end
+
+  def show
+    self.matching_refs = protected_ref.matching(project_refs)
+  end
+
+  def update
+    self.protected_ref = update_service.new(@project, current_user, protected_ref_params).execute(protected_ref)
+
+    if protected_ref.valid?
+      respond_to do |format|
+        format.json { render json: protected_ref, status: :ok }
+      end
+    else
+      respond_to do |format|
+        format.json { render json: protected_ref.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def destroy
+    protected_ref.destroy
+
+    respond_to do |format|
+      format.html { redirect_to_repository_settings(@project) }
+      format.js { head :ok }
+    end
+  end
+end
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index 5ab5d1d997b..8f407b42ac8 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -1,58 +1,36 @@
-class Projects::ProtectedTagsController < Projects::ApplicationController
-  include RepositorySettingsRedirect
-  # Authorize
-  before_action :require_non_empty_project
-  before_action :authorize_admin_project!
-  before_action :load_protected_tag, only: [:show, :update, :destroy]
+class Projects::ProtectedTagsController < Projects::ProtectedRefsController
 
-  layout "project_settings"
+  protected
 
-  def index
-    redirect_to_repository_settings(@project)
+  def protected_ref
+    @protected_tag
   end
 
-  def create
-    @protected_tag = ::ProtectedTags::CreateService.new(@project, current_user, protected_tag_params).execute
-    unless @protected_tag.persisted?
-      flash[:alert] = @protected_tags.errors.full_messages.join(', ').html_safe
-    end
-    redirect_to_repository_settings(@project)
+  def protected_ref=(val)
+    @protected_tag = val
   end
 
-  def show
-    @matching_tags = @protected_tag.matching(@project.repository.tags)
+  def matching_refs=(val)
+    @matching_tags = val
   end
 
-  def update
-    @protected_tag = ::ProtectedTags::UpdateService.new(@project, current_user, protected_tag_params).execute(@protected_tag)
-
-    if @protected_tag.valid?
-      respond_to do |format|
-        format.json { render json: @protected_tag, status: :ok }
-      end
-    else
-      respond_to do |format|
-        format.json { render json: @protected_tag.errors, status: :unprocessable_entity }
-      end
-    end
+  def project_refs
+    @project.repository.tags
   end
 
-  def destroy
-    @protected_tag.destroy
-
-    respond_to do |format|
-      format.html { redirect_to_repository_settings(@project) }
-      format.js { head :ok }
-    end
+  def create_service
+    ::ProtectedTags::CreateService
   end
 
-  private
+  def update_service
+    ::ProtectedTags::UpdateService
+  end
 
-  def load_protected_tag
-    @protected_tag = @project.protected_tags.find(params[:id])
+  def load_protected_ref
+    self.protected_ref = @project.protected_tags.find(params[:id])
   end
 
-  def protected_tag_params
+  def protected_ref_params
     params.require(:protected_tag).permit(:name, push_access_levels_attributes: [:access_level, :id])
   end
 end
-- 
cgit v1.2.1


From ff2713a57046bd08764ad391d7f34bd27f787610 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Mon, 3 Apr 2017 22:04:37 +0100
Subject: Fix typos in ProtectedRef concern and whitespace detected by rubocop

---
 app/controllers/projects/protected_branches_controller.rb  | 1 -
 app/controllers/projects/protected_tags_controller.rb      | 1 -
 app/controllers/projects/settings/repository_controller.rb | 1 -
 app/models/concerns/protected_ref.rb                       | 4 ++--
 4 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index a245a60910e..c2a55c9500a 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,5 +1,4 @@
 class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
-
   protected
 
   def protected_ref
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index 8f407b42ac8..ff132056aa4 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -1,5 +1,4 @@
 class Projects::ProtectedTagsController < Projects::ProtectedRefsController
-
   protected
 
   def protected_ref
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index fb175b4a636..ff818d9e51a 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -19,7 +19,6 @@ module Projects
         load_gon_index
       end
 
-
       def access_levels_options
         #TODO: consider protected tags
         #TODO: Refactor ProtectedBranch::PushAccessLevel so it doesn't mention branches
diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index 3681ae63e3a..f6841669ab0 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -9,13 +9,13 @@ module ProtectedRef
     delegate :matching, :matches?, :wildcard?, to: :ref_matcher
 
     def self.matching_refs_accesible_to(ref, user, action: :push)
-      access_levels_for_ref(ref, action).any? do |access_level|
+      access_levels_for_ref(ref, action: action).any? do |access_level|
         access_level.check_access(user)
       end
     end
 
     def self.access_levels_for_ref(ref, action: :push)
-      self.matching(ref).map(&:"@#{action}_access_levels").flatten
+      self.matching(ref).map(&:"#{action}_access_levels").flatten
     end
 
     def self.matching(ref_name, protected_refs: nil)
-- 
cgit v1.2.1


From d5acb69e116cbbed105e29552d7cca2e864f0c8f Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 00:05:51 +0100
Subject: Protected Tags prevents all updates instead of just force pushes.

This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature
---
 app/views/projects/protected_tags/_index.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml
index 591d64ae7de..0bfb1ad191d 100644
--- a/app/views/projects/protected_tags/_index.html.haml
+++ b/app/views/projects/protected_tags/_index.html.haml
@@ -8,8 +8,8 @@
     %p.prepend-top-20
       By default, Protected tags are designed to:
       %ul
-        %li Prevent tag pushes from everybody except Masters
-        %li Prevent <strong>anyone</strong> from force pushing to the tag
+        %li Prevent tag creation by everybody except Masters
+        %li Prevent <strong>anyone</strong> from updating the tag
         %li Prevent <strong>anyone</strong> from deleting the tag
   .col-lg-9
     - if can? current_user, :admin_project, @project
-- 
cgit v1.2.1


From 90c8bb8301b4bc3268a5fa4ea8bddafbc29d6871 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 01:39:34 +0100
Subject: Fixed developers_can_push in RepoBranch API entity

---
 app/models/concerns/protected_ref.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app')

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index f6841669ab0..a04dea0bc55 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -14,6 +14,12 @@ module ProtectedRef
       end
     end
 
+    def self.developers_can?(action, ref)
+      access_levels_for_ref(ref, action: action).any? do |access_level|
+        access_level.access_level == Gitlab::Access::DEVELOPER
+      end
+    end
+
     def self.access_levels_for_ref(ref, action: :push)
       self.matching(ref).map(&:"#{action}_access_levels").flatten
     end
-- 
cgit v1.2.1


From 1e15444ae6dda02744db42d08c817252953c7b1f Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 02:05:42 +0100
Subject: Cleanup & tests for UserAccess#can_create_tag?

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

(limited to 'app')

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index a04dea0bc55..ab28eb19b64 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -8,7 +8,7 @@ module ProtectedRef
 
     delegate :matching, :matches?, :wildcard?, to: :ref_matcher
 
-    def self.matching_refs_accesible_to(ref, user, action: :push)
+    def self.protected_ref_accessible_to?(ref, user, action: :push)
       access_levels_for_ref(ref, action: action).any? do |access_level|
         access_level.check_access(user)
       end
-- 
cgit v1.2.1


From f9e849c076efb3162a3d951d8aae2e7be3e574f4 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 02:59:37 +0100
Subject: Cleaned up duplication with ProtectedRefAccess concern

---
 .../projects/settings/repository_controller.rb     | 19 ++++++-------
 app/models/concerns/protected_branch_access.rb     | 15 ++--------
 app/models/concerns/protected_ref_access.rb        | 32 ++++++++++------------
 app/models/concerns/protected_tag_access.rb        | 15 ++--------
 4 files changed, 27 insertions(+), 54 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index ff818d9e51a..9022cf8f0d8 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -23,19 +23,18 @@ module Projects
         #TODO: consider protected tags
         #TODO: Refactor ProtectedBranch::PushAccessLevel so it doesn't mention branches
         {
-          push_access_levels: {
-            roles: ProtectedBranch::PushAccessLevel.human_access_levels.map do |id, text|
-              { id: id, text: text, before_divider: true }
-            end
-          },
-          merge_access_levels: {
-            roles: ProtectedBranch::MergeAccessLevel.human_access_levels.map do |id, text|
-              { id: id, text: text, before_divider: true }
-            end
-          }
+          push_access_levels: levels_for_dropdown(ProtectedBranch::PushAccessLevel),
+          merge_access_levels: levels_for_dropdown(ProtectedBranch::MergeAccessLevel)
         }
       end
 
+      def levels_for_dropdown(access_level_type)
+        roles = access_level_type.human_access_levels.map do |id, text|
+          { id: id, text: text, before_divider: true }
+        end
+        { roles: roles }
+      end
+
       def protectable_tags_for_dropdown
         { open_tags: ProtectableDropdown.new(@project, :tags).hash }
       end
diff --git a/app/models/concerns/protected_branch_access.rb b/app/models/concerns/protected_branch_access.rb
index 9dd4d9c6f24..06cae00249a 100644
--- a/app/models/concerns/protected_branch_access.rb
+++ b/app/models/concerns/protected_branch_access.rb
@@ -2,20 +2,9 @@ module ProtectedBranchAccess
   extend ActiveSupport::Concern
 
   included do
+    include ProtectedRefAccess
+
     belongs_to :protected_branch
     delegate :project, to: :protected_branch
-
-    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
-    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
-  end
-
-  def humanize
-    self.class.human_access_levels[self.access_level]
-  end
-
-  def check_access(user)
-    return true if user.is_admin?
-
-    project.team.max_member_access(user.id) >= access_level
   end
 end
diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
index 08377127f69..0c7e5157cdf 100644
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -1,22 +1,18 @@
-#TODO: Refactor, checking EE
-# module ProtectedRefAccess
-#   extend ActiveSupport::Concern
+module ProtectedRefAccess
+  extend ActiveSupport::Concern
 
-#   included do
-#     # belongs_to :protected_branch
-#     # delegate :project, to: :protected_branch
+  included do
+    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
+    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
+  end
 
-#     scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
-#     scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
-#   end
+  def humanize
+    self.class.human_access_levels[self.access_level]
+  end
 
-#   def humanize
-#     self.class.human_access_levels[self.access_level]
-#   end
+  def check_access(user)
+    return true if user.is_admin?
 
-#   def check_access(user)
-#     return true if user.is_admin?
-
-#     project.team.max_member_access(user.id) >= access_level
-#   end
-# end
+    project.team.max_member_access(user.id) >= access_level
+  end
+end
diff --git a/app/models/concerns/protected_tag_access.rb b/app/models/concerns/protected_tag_access.rb
index cf66a6434b5..9b7d31a6fd5 100644
--- a/app/models/concerns/protected_tag_access.rb
+++ b/app/models/concerns/protected_tag_access.rb
@@ -2,20 +2,9 @@ module ProtectedTagAccess
   extend ActiveSupport::Concern
 
   included do
+    include ProtectedRefAccess
+
     belongs_to :protected_tag
     delegate :project, to: :protected_tag
-
-    scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
-    scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
-  end
-
-  def humanize
-    self.class.human_access_levels[self.access_level]
-  end
-
-  def check_access(user)
-    return true if user.is_admin?
-
-    project.team.max_member_access(user.id) >= access_level
   end
 end
-- 
cgit v1.2.1


From 07d7d8e65905a39164b63f55eccdcea8f10f5d14 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 03:37:22 +0100
Subject: Renamed ProtectedTag push_access_levels to create_access_levels

---
 .../protected_tags/protected_tag_create.js         | 14 +++++++-------
 .../protected_tags/protected_tag_edit.js           | 22 +++++++++++-----------
 .../projects/protected_tags_controller.rb          |  2 +-
 .../projects/settings/repository_controller.rb     |  5 ++---
 app/models/protected_tag.rb                        |  6 +++---
 app/models/protected_tag/create_access_level.rb    | 21 +++++++++++++++++++++
 app/models/protected_tag/push_access_level.rb      | 21 ---------------------
 .../protected_tags/_create_protected_tag.html.haml | 10 +++++-----
 .../projects/protected_tags/_tags_list.html.haml   |  2 +-
 .../protected_tags/_update_protected_tag.haml      |  8 ++++----
 10 files changed, 55 insertions(+), 56 deletions(-)
 create mode 100644 app/models/protected_tag/create_access_level.rb
 delete mode 100644 app/models/protected_tag/push_access_level.rb

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 4c652e7747f..84b1b232649 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -11,20 +11,20 @@
     }
 
     buildDropdowns() {
-      const $allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+      const $allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
 
       // Cache callback
       this.onSelectCallback = this.onSelect.bind(this);
 
-      // Allowed to Push dropdown
+      // Allowed to Create dropdown
       new gl.ProtectedTagAccessDropdown({
-        $dropdown: $allowedToPushDropdown,
-        data: gon.push_access_levels,
+        $dropdown: $allowedToCreateDropdown,
+        data: gon.create_access_levels,
         onSelect: this.onSelectCallback
       });
 
       // Select default
-      $allowedToPushDropdown.data('glDropdown').selectRowAtIndex(0);
+      $allowedToCreateDropdown.data('glDropdown').selectRowAtIndex(0);
 
       // Protected tag dropdown
       new ProtectedTagDropdown({
@@ -37,9 +37,9 @@
     onSelect() {
       // Enable submit button
       const $tagInput = this.$wrap.find('input[name="protected_tag[name]"]');
-      const $allowedToPushInput = this.$wrap.find('input[name="protected_tag[push_access_levels_attributes][0][access_level]"]');
+      const $allowedToCreateInput = this.$wrap.find('input[name="protected_tag[create_access_levels_attributes][0][access_level]"]');
 
-      this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToPushInput.length));
+      this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToCreateInput.length));
     }
   };
 })(window);
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index b93e903621e..0227be35c8f 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -7,27 +7,27 @@
   gl.ProtectedTagEdit = class {
     constructor(options) {
       this.$wrap = options.$wrap;
-      this.$allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
+      this.$allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
 
       this.buildDropdowns();
     }
 
     buildDropdowns() {
-      // Allowed to push dropdown
+      // Allowed to create dropdown
       new gl.ProtectedTagAccessDropdown({
-        $dropdown: this.$allowedToPushDropdown,
-        data: gon.push_access_levels,
+        $dropdown: this.$allowedToCreateDropdown,
+        data: gon.create_access_levels,
         onSelect: this.onSelect.bind(this)
       });
     }
 
     onSelect() {
-      const $allowedToPushInput = this.$wrap.find(`input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`);
+      const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdown.data('fieldName')}"]`);
 
       // Do not update if one dropdown has not selected any option
-      if (!$allowedToPushInput.length) return;
+      if (!$allowedToCreateInput.length) return;
 
-      this.$allowedToPushDropdown.disable();
+      this.$allowedToCreateDropdown.disable();
 
       $.ajax({
         type: 'POST',
@@ -36,9 +36,9 @@
         data: {
           _method: 'PATCH',
           protected_tag: {
-            push_access_levels_attributes: [{
-              id: this.$allowedToPushDropdown.data('access-level-id'),
-              access_level: $allowedToPushInput.val()
+            create_access_levels_attributes: [{
+              id: this.$allowedToCreateDropdown.data('access-level-id'),
+              access_level: $allowedToCreateInput.val()
             }]
           }
         },
@@ -47,7 +47,7 @@
           new Flash('Failed to update tag!');
         }
       }).always(() => {
-        this.$allowedToPushDropdown.enable();
+        this.$allowedToCreateDropdown.enable();
       });
     }
   };
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index ff132056aa4..0e00baedbdf 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -30,6 +30,6 @@ class Projects::ProtectedTagsController < Projects::ProtectedRefsController
   end
 
   def protected_ref_params
-    params.require(:protected_tag).permit(:name, push_access_levels_attributes: [:access_level, :id])
+    params.require(:protected_tag).permit(:name, create_access_levels_attributes: [:access_level, :id])
   end
 end
diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb
index 9022cf8f0d8..44de8a49593 100644
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -13,16 +13,15 @@ module Projects
 
       def define_protected_refs
         @protected_branches = @project.protected_branches.order(:name).page(params[:page])
-        @protected_tags = @project.protected_tags.order(:name).page(params[:page]) #TODO duplicated pagination param?
+        @protected_tags = @project.protected_tags.order(:name).page(params[:page])
         @protected_branch = @project.protected_branches.new
         @protected_tag = @project.protected_tags.new
         load_gon_index
       end
 
       def access_levels_options
-        #TODO: consider protected tags
-        #TODO: Refactor ProtectedBranch::PushAccessLevel so it doesn't mention branches
         {
+          create_access_levels: levels_for_dropdown(ProtectedTag::CreateAccessLevel),
           push_access_levels: levels_for_dropdown(ProtectedBranch::PushAccessLevel),
           merge_access_levels: levels_for_dropdown(ProtectedBranch::MergeAccessLevel)
         }
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
index a52fe90bb2b..83964095516 100644
--- a/app/models/protected_tag.rb
+++ b/app/models/protected_tag.rb
@@ -2,11 +2,11 @@ class ProtectedTag < ActiveRecord::Base
   include Gitlab::ShellAdapter
   include ProtectedRef
 
-  has_many :push_access_levels, dependent: :destroy
+  has_many :create_access_levels, dependent: :destroy
 
-  validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
+  validates :create_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
 
-  accepts_nested_attributes_for :push_access_levels
+  accepts_nested_attributes_for :create_access_levels
 
   def self.protected?(project, ref_name)
     self.matching(ref_name, protected_refs: project.protected_tags).present?
diff --git a/app/models/protected_tag/create_access_level.rb b/app/models/protected_tag/create_access_level.rb
new file mode 100644
index 00000000000..c7e1319719d
--- /dev/null
+++ b/app/models/protected_tag/create_access_level.rb
@@ -0,0 +1,21 @@
+class ProtectedTag::CreateAccessLevel < ActiveRecord::Base
+  include ProtectedTagAccess
+
+  validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
+                                                             Gitlab::Access::DEVELOPER,
+                                                             Gitlab::Access::NO_ACCESS] }
+
+  def self.human_access_levels
+    {
+      Gitlab::Access::MASTER => "Masters",
+      Gitlab::Access::DEVELOPER => "Developers + Masters",
+      Gitlab::Access::NO_ACCESS => "No one"
+    }.with_indifferent_access
+  end
+
+  def check_access(user)
+    return false if access_level == Gitlab::Access::NO_ACCESS
+
+    super
+  end
+end
diff --git a/app/models/protected_tag/push_access_level.rb b/app/models/protected_tag/push_access_level.rb
deleted file mode 100644
index 9282af841ce..00000000000
--- a/app/models/protected_tag/push_access_level.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class ProtectedTag::PushAccessLevel < ActiveRecord::Base
-  include ProtectedTagAccess
-
-  validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
-                                                             Gitlab::Access::DEVELOPER,
-                                                             Gitlab::Access::NO_ACCESS] }
-
-  def self.human_access_levels
-    {
-      Gitlab::Access::MASTER => "Masters",
-      Gitlab::Access::DEVELOPER => "Developers + Masters",
-      Gitlab::Access::NO_ACCESS => "No one"
-    }.with_indifferent_access
-  end
-
-  def check_access(user)
-    return false if access_level == Gitlab::Access::NO_ACCESS
-
-    super
-  end
-end
diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index 9fdebf2c982..af332f942d6 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -19,14 +19,14 @@
               %code production/*
               are supported
         .form-group
-          %label.col-md-2.text-right{ for: 'push_access_levels_attributes' }
-            Allowed to push:
+          %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
+            Allowed to create:
           .col-md-10
-            .push_access_levels-container
+            .create_access_levels-container
               = dropdown_tag('Select',
-                             options: { toggle_class: 'js-allowed-to-push wide',
+                             options: { toggle_class: 'js-allowed-to-create wide',
                              dropdown_class: 'dropdown-menu-selectable',
-                             data: { field_name: 'protected_tag[push_access_levels_attributes][0][access_level]', input_id: 'push_access_levels_attributes' }})
+                             data: { field_name: 'protected_tag[create_access_levels_attributes][0][access_level]', input_id: 'create_access_levels_attributes' }})
 
     .panel-footer
       = f.submit 'Protect', class: 'btn-create btn', disabled: true
diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml
index 6f63971923d..cc006ed8a0b 100644
--- a/app/views/projects/protected_tags/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/_tags_list.html.haml
@@ -17,7 +17,7 @@
         %tr
           %th Protected tag (#{@protected_tags.size})
           %th Last commit
-          %th Allowed to push
+          %th Allowed to create
           - if can_admin_project
             %th
       %tbody
diff --git a/app/views/projects/protected_tags/_update_protected_tag.haml b/app/views/projects/protected_tags/_update_protected_tag.haml
index 802a5ef3b98..62823bee46e 100644
--- a/app/views/projects/protected_tags/_update_protected_tag.haml
+++ b/app/views/projects/protected_tags/_update_protected_tag.haml
@@ -1,5 +1,5 @@
 %td
-  = hidden_field_tag "allowed_to_push_#{protected_tag.id}", protected_tag.push_access_levels.first.access_level
-  = dropdown_tag( (protected_tag.push_access_levels.first.humanize || 'Select') ,
-                 options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container',
-                 data: { field_name: "allowed_to_push_#{protected_tag.id}", access_level_id: protected_tag.push_access_levels.first.id }})
+  = hidden_field_tag "allowed_to_create_#{protected_tag.id}", protected_tag.create_access_levels.first.access_level
+  = dropdown_tag( (protected_tag.create_access_levels.first.humanize || 'Select') ,
+                 options: { toggle_class: 'js-allowed-to-create', dropdown_class: 'dropdown-menu-selectable js-allowed-to-create-container',
+                 data: { field_name: "allowed_to_create_#{protected_tag.id}", access_level_id: protected_tag.create_access_levels.first.id }})
-- 
cgit v1.2.1


From d85471ac1a4574053b057dd7cc02858d591a8ffd Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 4 Apr 2017 03:50:15 +0100
Subject: Fixed UserAccess#can_create_tag? after create_access_levels rename

---
 app/models/concerns/protected_ref.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index ab28eb19b64..7c0183952a0 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -8,7 +8,7 @@ module ProtectedRef
 
     delegate :matching, :matches?, :wildcard?, to: :ref_matcher
 
-    def self.protected_ref_accessible_to?(ref, user, action: :push)
+    def self.protected_ref_accessible_to?(ref, user, action:)
       access_levels_for_ref(ref, action: action).any? do |access_level|
         access_level.check_access(user)
       end
@@ -20,7 +20,7 @@ module ProtectedRef
       end
     end
 
-    def self.access_levels_for_ref(ref, action: :push)
+    def self.access_levels_for_ref(ref, action:)
       self.matching(ref).map(&:"#{action}_access_levels").flatten
     end
 
-- 
cgit v1.2.1


From 678672b0664d94d33b606d8ad13e1333cad2a5be Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 14:16:52 +0530
Subject: Bundle renamed to `index.js`

---
 app/assets/javascripts/protected_tags/index.js                 | 5 +++++
 app/assets/javascripts/protected_tags/protected_tags_bundle.js | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/protected_tags/index.js
 delete mode 100644 app/assets/javascripts/protected_tags/protected_tags_bundle.js

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/index.js b/app/assets/javascripts/protected_tags/index.js
new file mode 100644
index 00000000000..889a8053e6f
--- /dev/null
+++ b/app/assets/javascripts/protected_tags/index.js
@@ -0,0 +1,5 @@
+require('./protected_tag_access_dropdown');
+require('./protected_tag_create');
+require('./protected_tag_dropdown');
+require('./protected_tag_edit');
+require('./protected_tag_edit_list');
diff --git a/app/assets/javascripts/protected_tags/protected_tags_bundle.js b/app/assets/javascripts/protected_tags/protected_tags_bundle.js
deleted file mode 100644
index 889a8053e6f..00000000000
--- a/app/assets/javascripts/protected_tags/protected_tags_bundle.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require('./protected_tag_access_dropdown');
-require('./protected_tag_create');
-require('./protected_tag_dropdown');
-require('./protected_tag_edit');
-require('./protected_tag_edit_list');
-- 
cgit v1.2.1


From 115d4a41061a94c294fa7cbd218a983ef06e0965 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 14:17:19 +0530
Subject: Convert to pure ES6 class

---
 .../protected_tag_access_dropdown.js               |  51 +++++------
 .../protected_tags/protected_tag_create.js         |  86 +++++++++---------
 .../protected_tags/protected_tag_dropdown.js       |  12 +--
 .../protected_tags/protected_tag_edit.js           | 100 ++++++++++-----------
 .../protected_tags/protected_tag_edit_list.js      |  29 +++---
 5 files changed, 132 insertions(+), 146 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
index b85c2991dd9..681b060f859 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
@@ -1,29 +1,26 @@
-/* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, max-len */
+export default class ProtectedTagAccessDropdown {
+  constructor(options) {
+    this.options = options;
+    this.initDropdown();
+  }
 
-(global => {
-  global.gl = global.gl || {};
-
-  gl.ProtectedTagAccessDropdown = class {
-    constructor(options) {
-      const { $dropdown, data, onSelect } = options;
-
-      $dropdown.glDropdown({
-        data: data,
-        selectable: true,
-        inputId: $dropdown.data('input-id'),
-        fieldName: $dropdown.data('field-name'),
-        toggleLabel(item, el) {
-          if (el.is('.is-active')) {
-            return item.text;
-          } else {
-            return 'Select';
-          }
-        },
-        clicked(item, $el, e) {
-          e.preventDefault();
-          onSelect();
+  initDropdown() {
+    const { onSelect } = this.options;
+    this.options.$dropdown.glDropdown({
+      data: this.options.data,
+      selectable: true,
+      inputId: this.options.$dropdown.data('input-id'),
+      fieldName: this.options.$dropdown.data('field-name'),
+      toggleLabel(item, el) {
+        if (el.is('.is-active')) {
+          return item.text;
         }
-      });
-    }
-  };
-})(window);
+        return 'Select';
+      },
+      clicked(item, $el, e) {
+        e.preventDefault();
+        onSelect();
+      },
+    });
+  }
+}
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 84b1b232649..964e67c9de0 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -1,45 +1,41 @@
-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
-/* global ProtectedTagDropdown */
-
-(global => {
-  global.gl = global.gl || {};
-
-  gl.ProtectedTagCreate = class {
-    constructor() {
-      this.$wrap = this.$form = $('.new_protected_tag');
-      this.buildDropdowns();
-    }
-
-    buildDropdowns() {
-      const $allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
-
-      // Cache callback
-      this.onSelectCallback = this.onSelect.bind(this);
-
-      // Allowed to Create dropdown
-      new gl.ProtectedTagAccessDropdown({
-        $dropdown: $allowedToCreateDropdown,
-        data: gon.create_access_levels,
-        onSelect: this.onSelectCallback
-      });
-
-      // Select default
-      $allowedToCreateDropdown.data('glDropdown').selectRowAtIndex(0);
-
-      // Protected tag dropdown
-      new ProtectedTagDropdown({
-        $dropdown: this.$wrap.find('.js-protected-tag-select'),
-        onSelect: this.onSelectCallback
-      });
-    }
-
-    // This will run after clicked callback
-    onSelect() {
-      // Enable submit button
-      const $tagInput = this.$wrap.find('input[name="protected_tag[name]"]');
-      const $allowedToCreateInput = this.$wrap.find('input[name="protected_tag[create_access_levels_attributes][0][access_level]"]');
-
-      this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToCreateInput.length));
-    }
-  };
-})(window);
+import ProtectedTagAccessDropdown from './protected_tag_access_dropdown';
+import ProtectedTagDropdown from './protected_tag_dropdown';
+
+export default class ProtectedTagCreate {
+  constructor() {
+    this.$form = $('.new_protected_tag');
+    this.buildDropdowns();
+  }
+
+  buildDropdowns() {
+    const $allowedToCreateDropdown = this.$form.find('.js-allowed-to-create');
+
+    // Cache callback
+    this.onSelectCallback = this.onSelect.bind(this);
+
+    // Allowed to Create dropdown
+    this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({
+      $dropdown: $allowedToCreateDropdown,
+      data: gon.create_access_levels,
+      onSelect: this.onSelectCallback,
+    });
+
+    // Select default
+    $allowedToCreateDropdown.data('glDropdown').selectRowAtIndex(0);
+
+    // Protected tag dropdown
+    this.protectedTagDropdown = new ProtectedTagDropdown({
+      $dropdown: this.$form.find('.js-protected-tag-select'),
+      onSelect: this.onSelectCallback,
+    });
+  }
+
+  // This will run after clicked callback
+  onSelect() {
+    // Enable submit button
+    const $tagInput = this.$form.find('input[name="protected_tag[name]"]');
+    const $allowedToCreateInput = this.$form.find('input[name="protected_tag[create_access_levels_attributes][0][access_level]"]');
+
+    this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToCreateInput.length));
+  }
+}
diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
index ccc4c81fa18..9be9e2bea6f 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -1,6 +1,4 @@
-/* eslint-disable comma-dangle, no-unused-vars */
-
-class ProtectedTagDropdown {
+export default class ProtectedTagDropdown {
   constructor(options) {
     this.onSelect = options.onSelect;
     this.$dropdown = options.$dropdown;
@@ -21,7 +19,7 @@ class ProtectedTagDropdown {
       filterable: true,
       remote: false,
       search: {
-        fields: ['title']
+        fields: ['title'],
       },
       selectable: true,
       toggleLabel(selected) {
@@ -38,7 +36,7 @@ class ProtectedTagDropdown {
       clicked: (item, $el, e) => {
         e.preventDefault();
         this.onSelect();
-      }
+      },
     });
   }
 
@@ -63,7 +61,7 @@ class ProtectedTagDropdown {
     this.selectedTag = {
       title: tagName,
       id: tagName,
-      text: tagName
+      text: tagName,
     };
 
     if (tagName) {
@@ -75,5 +73,3 @@ class ProtectedTagDropdown {
     this.$dropdownFooter.toggleClass('hidden', !tagName);
   }
 }
-
-window.ProtectedTagDropdown = ProtectedTagDropdown;
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index 0227be35c8f..b5092877138 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -1,54 +1,52 @@
-/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
+/* eslint-disable no-new */
 /* global Flash */
 
-(global => {
-  global.gl = global.gl || {};
-
-  gl.ProtectedTagEdit = class {
-    constructor(options) {
-      this.$wrap = options.$wrap;
-      this.$allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
-
-      this.buildDropdowns();
-    }
-
-    buildDropdowns() {
-      // Allowed to create dropdown
-      new gl.ProtectedTagAccessDropdown({
-        $dropdown: this.$allowedToCreateDropdown,
-        data: gon.create_access_levels,
-        onSelect: this.onSelect.bind(this)
-      });
-    }
-
-    onSelect() {
-      const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdown.data('fieldName')}"]`);
-
-      // Do not update if one dropdown has not selected any option
-      if (!$allowedToCreateInput.length) return;
-
-      this.$allowedToCreateDropdown.disable();
-
-      $.ajax({
-        type: 'POST',
-        url: this.$wrap.data('url'),
-        dataType: 'json',
-        data: {
-          _method: 'PATCH',
-          protected_tag: {
-            create_access_levels_attributes: [{
-              id: this.$allowedToCreateDropdown.data('access-level-id'),
-              access_level: $allowedToCreateInput.val()
-            }]
-          }
+import ProtectedTagAccessDropdown from './protected_tag_access_dropdown';
+
+export default class ProtectedTagEdit {
+  constructor(options) {
+    this.$wrap = options.$wrap;
+    this.$allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
+
+    this.buildDropdowns();
+  }
+
+  buildDropdowns() {
+    // Allowed to create dropdown
+    this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({
+      $dropdown: this.$allowedToCreateDropdown,
+      data: gon.create_access_levels,
+      onSelect: this.onSelect.bind(this),
+    });
+  }
+
+  onSelect() {
+    const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdown.data('fieldName')}"]`);
+
+    // Do not update if one dropdown has not selected any option
+    if (!$allowedToCreateInput.length) return;
+
+    this.$allowedToCreateDropdown.disable();
+
+    $.ajax({
+      type: 'POST',
+      url: this.$wrap.data('url'),
+      dataType: 'json',
+      data: {
+        _method: 'PATCH',
+        protected_tag: {
+          create_access_levels_attributes: [{
+            id: this.$allowedToCreateDropdown.data('access-level-id'),
+            access_level: $allowedToCreateInput.val(),
+          }],
         },
-        error() {
-          $.scrollTo(0);
-          new Flash('Failed to update tag!');
-        }
-      }).always(() => {
-        this.$allowedToCreateDropdown.enable();
-      });
-    }
-  };
-})(window);
+      },
+      error() {
+        $.scrollTo(0);
+        new Flash('Failed to update tag!');
+      },
+    }).always(() => {
+      this.$allowedToCreateDropdown.enable();
+    });
+  }
+}
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
index ba40c227ef4..88c7accdec6 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
@@ -1,18 +1,17 @@
-/* eslint-disable arrow-parens, no-param-reassign, no-new, comma-dangle */
+import ProtectedTagEdit from './protected_tag_edit';
 
-(global => {
-  global.gl = global.gl || {};
+export default class ProtectedTagEditList {
+  constructor() {
+    this.$wrap = $('.protected-tags-list');
+    this.protectedTagList = [];
+    this.initEditForm();
+  }
 
-  gl.ProtectedTagEditList = class {
-    constructor() {
-      this.$wrap = $('.protected-tags-list');
-
-      // Build edit forms
-      this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => {
-        new gl.ProtectedTagEdit({
-          $wrap: $(el)
-        });
+  initEditForm() {
+    this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => {
+      this.protectedTagList[i] = new ProtectedTagEdit({
+        $wrap: $(el),
       });
-    }
-  };
-})(window);
+    });
+  }
+}
-- 
cgit v1.2.1


From 92b75704c2b6e827d333b85ab3d1d99aed84cb6f Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 14:17:41 +0530
Subject: Re-export classes using ES6 `export`

---
 app/assets/javascripts/protected_tags/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/index.js b/app/assets/javascripts/protected_tags/index.js
index 889a8053e6f..da036f5437e 100644
--- a/app/assets/javascripts/protected_tags/index.js
+++ b/app/assets/javascripts/protected_tags/index.js
@@ -1,5 +1,5 @@
-require('./protected_tag_access_dropdown');
-require('./protected_tag_create');
-require('./protected_tag_dropdown');
-require('./protected_tag_edit');
-require('./protected_tag_edit_list');
+export { default as ProtectedTagAccessDropdown } from './protected_tag_access_dropdown';
+export { default as ProtectedTagCreate } from './protected_tag_create';
+export { default as ProtectedTagDropdown } from './protected_tag_dropdown';
+export { default as ProtectedTagEdit } from './protected_tag_edit';
+export { default as ProtectedTagEditList } from './protected_tag_edit_list';
-- 
cgit v1.2.1


From 59be20f06fa6d4a98dac5b45c3dee2aeebe813e2 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 14:18:03 +0530
Subject: Import Protected Tags classes

---
 app/assets/javascripts/dispatcher.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index d384927cc5b..4dc82bee6c3 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -41,6 +41,7 @@ import GroupsList from './groups_list';
 import ProjectsList from './projects_list';
 import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
 import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
+import { ProtectedTagCreate, ProtectedTagEditList } from './protected_tags';
 
 const ShortcutsBlob = require('./shortcuts_blob');
 const UserCallout = require('./user_callout');
@@ -322,8 +323,8 @@ const UserCallout = require('./user_callout');
           new gl.ProtectedBranchCreate();
           new gl.ProtectedBranchEditList();
           // Initialize Protected Tag Settings
-          new gl.ProtectedTagCreate();
-          new gl.ProtectedTagEditList();
+          new ProtectedTagCreate();
+          new ProtectedTagEditList();
           break;
         case 'projects:ci_cd:show':
           new gl.ProjectVariables();
-- 
cgit v1.2.1


From cd5b36d04e79ed8fcd649127e0d47e09ec325242 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 14:47:50 +0530
Subject: Add constructor doc, toggle helper

---
 .../protected_tags/protected_tag_dropdown.js       | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
index 9be9e2bea6f..9c78f2816a4 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -1,4 +1,10 @@
 export default class ProtectedTagDropdown {
+  /**
+   * @param {Object} options containing
+   *                         `$dropdown` target element
+   *                          `onSelect` event callback
+   * $dropdown must be an element created using `dropdown_tag()` rails helper
+   */
   constructor(options) {
     this.onSelect = options.onSelect;
     this.$dropdown = options.$dropdown;
@@ -10,7 +16,7 @@ export default class ProtectedTagDropdown {
     this.bindEvents();
 
     // Hide footer
-    this.$dropdownFooter.addClass('hidden');
+    this.toggleFooter(true);
   }
 
   buildDropdown() {
@@ -58,18 +64,22 @@ export default class ProtectedTagDropdown {
   }
 
   toggleCreateNewButton(tagName) {
-    this.selectedTag = {
-      title: tagName,
-      id: tagName,
-      text: tagName,
-    };
-
     if (tagName) {
+      this.selectedTag = {
+        title: tagName,
+        id: tagName,
+        text: tagName,
+      };
+
       this.$dropdownContainer
         .find('.create-new-protected-tag code')
         .text(tagName);
     }
 
-    this.$dropdownFooter.toggleClass('hidden', !tagName);
+    this.toggleFooter(!tagName);
+  }
+
+  toggleFooter(toggleState) {
+    this.$dropdownFooter.toggleClass('hidden', toggleState);
   }
 }
-- 
cgit v1.2.1


From f16377e7dc762462817dd0b34e36811c55988b10 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Wed, 5 Apr 2017 18:59:46 +0100
Subject: Protected Tags backend review changes

Added changelog
---
 .../projects/protected_branches_controller.rb       | 18 +++---------------
 .../projects/protected_refs_controller.rb           | 21 ++++++++++-----------
 .../projects/protected_tags_controller.rb           | 18 +++---------------
 app/helpers/branches_helper.rb                      |  4 ++++
 app/models/concerns/protected_branch_access.rb      |  1 +
 app/models/concerns/protected_ref.rb                |  1 +
 app/models/concerns/protected_tag_access.rb         |  1 +
 app/models/project.rb                               |  2 +-
 app/models/protectable_dropdown.rb                  | 11 +++++++++--
 app/services/protected_branches/update_service.rb   |  7 ++-----
 app/services/protected_tags/update_service.rb       |  7 ++-----
 app/views/projects/branches/_branch.html.haml       |  2 +-
 .../projects/protected_branches/show.html.haml      |  8 ++++----
 app/views/projects/protected_tags/show.html.haml    |  8 ++++----
 14 files changed, 46 insertions(+), 63 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index c2a55c9500a..ba24fa9acfe 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,32 +1,20 @@
 class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
   protected
 
-  def protected_ref
-    @protected_branch
-  end
-
-  def protected_ref=(val)
-    @protected_branch = val
-  end
-
-  def matching_refs=(val)
-    @matching_branches = val
-  end
-
   def project_refs
     @project.repository.branches
   end
 
-  def create_service
+  def create_service_class
     ::ProtectedBranches::CreateService
   end
 
-  def update_service
+  def update_service_class
     ::ProtectedBranches::UpdateService
   end
 
   def load_protected_ref
-    self.protected_ref = @project.protected_branches.find(params[:id])
+    @protected_ref = @project.protected_branches.find(params[:id])
   end
 
   def protected_ref_params
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
index 63f005124a9..083a70968e5 100644
--- a/app/controllers/projects/protected_refs_controller.rb
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -1,5 +1,6 @@
 class Projects::ProtectedRefsController < Projects::ApplicationController
   include RepositorySettingsRedirect
+
   # Authorize
   before_action :require_non_empty_project
   before_action :authorize_admin_project!
@@ -12,33 +13,31 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
   end
 
   def create
-    self.protected_ref = create_service.new(@project, current_user, protected_ref_params).execute
+    protected_ref = create_service_class.new(@project, current_user, protected_ref_params).execute
+
     unless protected_ref.persisted?
       flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
     end
+
     redirect_to_repository_settings(@project)
   end
 
   def show
-    self.matching_refs = protected_ref.matching(project_refs)
+    @matching_refs = @protected_ref.matching(project_refs)
   end
 
   def update
-    self.protected_ref = update_service.new(@project, current_user, protected_ref_params).execute(protected_ref)
+    @protected_ref = update_service_class.new(@project, current_user, protected_ref_params).execute(@protected_ref)
 
-    if protected_ref.valid?
-      respond_to do |format|
-        format.json { render json: protected_ref, status: :ok }
-      end
+    if @protected_ref.valid?
+      render json: @protected_ref, status: :ok
     else
-      respond_to do |format|
-        format.json { render json: protected_ref.errors, status: :unprocessable_entity }
-      end
+      render json: @protected_ref.errors, status: :unprocessable_entity
     end
   end
 
   def destroy
-    protected_ref.destroy
+    @protected_ref.destroy
 
     respond_to do |format|
       format.html { redirect_to_repository_settings(@project) }
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index 0e00baedbdf..c61ddf145e6 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -1,32 +1,20 @@
 class Projects::ProtectedTagsController < Projects::ProtectedRefsController
   protected
 
-  def protected_ref
-    @protected_tag
-  end
-
-  def protected_ref=(val)
-    @protected_tag = val
-  end
-
-  def matching_refs=(val)
-    @matching_tags = val
-  end
-
   def project_refs
     @project.repository.tags
   end
 
-  def create_service
+  def create_service_class
     ::ProtectedTags::CreateService
   end
 
-  def update_service
+  def update_service_class
     ::ProtectedTags::UpdateService
   end
 
   def load_protected_ref
-    self.protected_ref = @project.protected_tags.find(params[:id])
+    @protected_ref = @project.protected_tags.find(params[:id])
   end
 
   def protected_ref_params
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index a852b90c57e..b7a28b1b4a7 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -29,4 +29,8 @@ module BranchesHelper
   def project_branches
     options_for_select(@project.repository.branch_names, @project.default_branch)
   end
+
+  def protected_branch?(project, branch)
+    ProtectedBranch.protected?(project, branch.name)
+  end
 end
diff --git a/app/models/concerns/protected_branch_access.rb b/app/models/concerns/protected_branch_access.rb
index 06cae00249a..c41b807df8a 100644
--- a/app/models/concerns/protected_branch_access.rb
+++ b/app/models/concerns/protected_branch_access.rb
@@ -5,6 +5,7 @@ module ProtectedBranchAccess
     include ProtectedRefAccess
 
     belongs_to :protected_branch
+
     delegate :project, to: :protected_branch
   end
 end
diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index 7c0183952a0..62eaec2407f 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -3,6 +3,7 @@ module ProtectedRef
 
   included do
     belongs_to :project
+
     validates :name, presence: true
     validates :project, presence: true
 
diff --git a/app/models/concerns/protected_tag_access.rb b/app/models/concerns/protected_tag_access.rb
index 9b7d31a6fd5..ee65de24dd8 100644
--- a/app/models/concerns/protected_tag_access.rb
+++ b/app/models/concerns/protected_tag_access.rb
@@ -5,6 +5,7 @@ module ProtectedTagAccess
     include ProtectedRefAccess
 
     belongs_to :protected_tag
+
     delegate :project, to: :protected_tag
   end
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 2469e6f8523..2c631050042 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -134,7 +134,7 @@ class Project < ActiveRecord::Base
   has_many :snippets,           dependent: :destroy, class_name: 'ProjectSnippet'
   has_many :hooks,              dependent: :destroy, class_name: 'ProjectHook'
   has_many :protected_branches, dependent: :destroy
-  has_many :protected_tags, dependent: :destroy
+  has_many :protected_tags,     dependent: :destroy
 
   has_many :project_authorizations
   has_many :authorized_users, through: :project_authorizations, source: :user, class_name: 'User'
diff --git a/app/models/protectable_dropdown.rb b/app/models/protectable_dropdown.rb
index c9b2b213cd2..122fbce257d 100644
--- a/app/models/protectable_dropdown.rb
+++ b/app/models/protectable_dropdown.rb
@@ -6,8 +6,7 @@ class ProtectableDropdown
 
   # Tags/branches which are yet to be individually protected
   def protectable_ref_names
-    non_wildcard_protections = protections.reject(&:wildcard?)
-    refs.map(&:name) - non_wildcard_protections.map(&:name)
+    @protectable_ref_names ||= ref_names - non_wildcard_protected_ref_names
   end
 
   def hash
@@ -20,7 +19,15 @@ class ProtectableDropdown
     @project.repository.public_send(@ref_type)
   end
 
+  def ref_names
+    refs.map(&:name)
+  end
+
   def protections
     @project.public_send("protected_#{@ref_type}")
   end
+
+  def non_wildcard_protected_ref_names
+    protections.reject(&:wildcard?).map(&:name)
+  end
 end
diff --git a/app/services/protected_branches/update_service.rb b/app/services/protected_branches/update_service.rb
index 89d8ba60134..4b3337a5c9d 100644
--- a/app/services/protected_branches/update_service.rb
+++ b/app/services/protected_branches/update_service.rb
@@ -1,13 +1,10 @@
 module ProtectedBranches
   class UpdateService < BaseService
-    attr_reader :protected_branch
-
     def execute(protected_branch)
       raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
 
-      @protected_branch = protected_branch
-      @protected_branch.update(params)
-      @protected_branch
+      protected_branch.update(params)
+      protected_branch
     end
   end
 end
diff --git a/app/services/protected_tags/update_service.rb b/app/services/protected_tags/update_service.rb
index 8a2419efd7b..aea6a48968d 100644
--- a/app/services/protected_tags/update_service.rb
+++ b/app/services/protected_tags/update_service.rb
@@ -1,13 +1,10 @@
 module ProtectedTags
   class UpdateService < BaseService
-    attr_reader :protected_tag
-
     def execute(protected_tag)
       raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
 
-      @protected_tag = protected_tag
-      @protected_tag.update(params)
-      @protected_tag
+      protected_tag.update(params)
+      protected_tag
     end
   end
 end
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index d84fa9e55c0..931a5f920d3 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -15,7 +15,7 @@
       %span.label.label-info.has-tooltip{ title: "Merged into #{@repository.root_ref}" }
         merged
 
-    - if ProtectedBranch.protected?(@project, branch.name)
+    - if protected_branch?(@project, branch)
       %span.label.label-success
         protected
     .controls.hidden-xs<
diff --git a/app/views/projects/protected_branches/show.html.haml b/app/views/projects/protected_branches/show.html.haml
index 4d8169815b3..f8cfe5e4b11 100644
--- a/app/views/projects/protected_branches/show.html.haml
+++ b/app/views/projects/protected_branches/show.html.haml
@@ -1,13 +1,13 @@
-- page_title @protected_branch.name, "Protected Branches"
+- page_title @protected_ref.name, "Protected Branches"
 
 .row.prepend-top-default.append-bottom-default
   .col-lg-3
     %h4.prepend-top-0
-      = @protected_branch.name
+      = @protected_ref.name
 
   .col-lg-9
     %h5 Matching Branches
-    - if @matching_branches.present?
+    - if @matching_refs.present?
       .table-responsive
         %table.table.protected-branches-list
           %colgroup
@@ -18,7 +18,7 @@
               %th Branch
               %th Last commit
           %tbody
-            - @matching_branches.each do |matching_branch|
+            - @matching_refs.each do |matching_branch|
               = render partial: "matching_branch", object: matching_branch
     - else
       %p.settings-message.text-center
diff --git a/app/views/projects/protected_tags/show.html.haml b/app/views/projects/protected_tags/show.html.haml
index 185807a7e8d..63743f28b3c 100644
--- a/app/views/projects/protected_tags/show.html.haml
+++ b/app/views/projects/protected_tags/show.html.haml
@@ -1,13 +1,13 @@
-- page_title @protected_tag.name, "Protected Tags"
+- page_title @protected_ref.name, "Protected Tags"
 
 .row.prepend-top-default.append-bottom-default
   .col-lg-3
     %h4.prepend-top-0
-      = @protected_tag.name
+      = @protected_ref.name
 
   .col-lg-9
     %h5 Matching Tags
-    - if @matching_tags.present?
+    - if @matching_refs.present?
       .table-responsive
         %table.table.protected-tags-list
           %colgroup
@@ -18,7 +18,7 @@
               %th Tag
               %th Last commit
           %tbody
-            - @matching_tags.each do |matching_tag|
+            - @matching_refs.each do |matching_tag|
               = render partial: "matching_tag", object: matching_tag
     - else
       %p.settings-message.text-center
-- 
cgit v1.2.1


From ca9cded45d78e821a1c778e22fde523873ffaf93 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 6 Apr 2017 19:09:48 +0530
Subject: Fixes as per feedback

---
 app/assets/javascripts/protected_tags/index.js           |  3 ---
 .../protected_tags/protected_tag_access_dropdown.js      |  4 ++--
 .../javascripts/protected_tags/protected_tag_create.js   |  4 ++--
 .../javascripts/protected_tags/protected_tag_dropdown.js |  3 ++-
 .../javascripts/protected_tags/protected_tag_edit.js     | 16 ++++++++--------
 .../protected_tags/protected_tag_edit_list.js            |  5 +++--
 app/assets/stylesheets/pages/projects.scss               |  3 ++-
 .../protected_tags/_create_protected_tag.html.haml       |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/index.js b/app/assets/javascripts/protected_tags/index.js
index da036f5437e..61e7ba53862 100644
--- a/app/assets/javascripts/protected_tags/index.js
+++ b/app/assets/javascripts/protected_tags/index.js
@@ -1,5 +1,2 @@
-export { default as ProtectedTagAccessDropdown } from './protected_tag_access_dropdown';
 export { default as ProtectedTagCreate } from './protected_tag_create';
-export { default as ProtectedTagDropdown } from './protected_tag_dropdown';
-export { default as ProtectedTagEdit } from './protected_tag_edit';
 export { default as ProtectedTagEditList } from './protected_tag_edit_list';
diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
index 681b060f859..fff83f3af3b 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
@@ -11,8 +11,8 @@ export default class ProtectedTagAccessDropdown {
       selectable: true,
       inputId: this.options.$dropdown.data('input-id'),
       fieldName: this.options.$dropdown.data('field-name'),
-      toggleLabel(item, el) {
-        if (el.is('.is-active')) {
+      toggleLabel(item, $el) {
+        if ($el.is('.is-active')) {
           return item.text;
         }
         return 'Select';
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 964e67c9de0..91bd140bd12 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -3,7 +3,7 @@ import ProtectedTagDropdown from './protected_tag_dropdown';
 
 export default class ProtectedTagCreate {
   constructor() {
-    this.$form = $('.new_protected_tag');
+    this.$form = $('.js-new-protected-tag');
     this.buildDropdowns();
   }
 
@@ -34,7 +34,7 @@ export default class ProtectedTagCreate {
   onSelect() {
     // Enable submit button
     const $tagInput = this.$form.find('input[name="protected_tag[name]"]');
-    const $allowedToCreateInput = this.$form.find('input[name="protected_tag[create_access_levels_attributes][0][access_level]"]');
+    const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes');
 
     this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToCreateInput.length));
   }
diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
index 9c78f2816a4..5ff4e443262 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -50,9 +50,10 @@ export default class ProtectedTagDropdown {
     this.$protectedTag.on('click', this.onClickCreateWildcard.bind(this));
   }
 
-  onClickCreateWildcard() {
+  onClickCreateWildcard(e) {
     this.$dropdown.data('glDropdown').remote.execute();
     this.$dropdown.data('glDropdown').selectRowAtIndex();
+    e.preventDefault();
   }
 
   getProtectedTags(term, callback) {
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index b5092877138..624067a5a09 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -6,7 +6,8 @@ import ProtectedTagAccessDropdown from './protected_tag_access_dropdown';
 export default class ProtectedTagEdit {
   constructor(options) {
     this.$wrap = options.$wrap;
-    this.$allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
+    this.$allowedToCreateDropdownButton = this.$wrap.find('.js-allowed-to-create');
+    this.onSelectCallback = this.onSelect.bind(this);
 
     this.buildDropdowns();
   }
@@ -14,19 +15,19 @@ export default class ProtectedTagEdit {
   buildDropdowns() {
     // Allowed to create dropdown
     this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({
-      $dropdown: this.$allowedToCreateDropdown,
+      $dropdown: this.$allowedToCreateDropdownButton,
       data: gon.create_access_levels,
-      onSelect: this.onSelect.bind(this),
+      onSelect: this.onSelectCallback,
     });
   }
 
   onSelect() {
-    const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdown.data('fieldName')}"]`);
+    const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`);
 
     // Do not update if one dropdown has not selected any option
     if (!$allowedToCreateInput.length) return;
 
-    this.$allowedToCreateDropdown.disable();
+    this.$allowedToCreateDropdownButton.disable();
 
     $.ajax({
       type: 'POST',
@@ -36,17 +37,16 @@ export default class ProtectedTagEdit {
         _method: 'PATCH',
         protected_tag: {
           create_access_levels_attributes: [{
-            id: this.$allowedToCreateDropdown.data('access-level-id'),
+            id: this.$allowedToCreateDropdownButton.data('access-level-id'),
             access_level: $allowedToCreateInput.val(),
           }],
         },
       },
       error() {
-        $.scrollTo(0);
         new Flash('Failed to update tag!');
       },
     }).always(() => {
-      this.$allowedToCreateDropdown.enable();
+      this.$allowedToCreateDropdownButton.enable();
     });
   }
 }
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
index 88c7accdec6..bd9fc872266 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
@@ -1,15 +1,16 @@
+/* eslint-disable no-new */
+
 import ProtectedTagEdit from './protected_tag_edit';
 
 export default class ProtectedTagEditList {
   constructor() {
     this.$wrap = $('.protected-tags-list');
-    this.protectedTagList = [];
     this.initEditForm();
   }
 
   initEditForm() {
     this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => {
-      this.protectedTagList[i] = new ProtectedTagEdit({
+      new ProtectedTagEdit({
         $wrap: $(el),
       });
     });
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 960875674cc..61b973e0aa9 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -779,7 +779,8 @@ pre.light-well {
 
 .protected-tags-list {
   .dropdown-menu-toggle {
-    width: 300px;
+    width: 100%;
+    max-width: 300px;
   }
 }
 
diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index af332f942d6..148efc16e64 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'new_protected_tag' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'js-new-protected-tag' } do |f|
   .panel.panel-default
     .panel-heading
       %h3.panel-title
-- 
cgit v1.2.1


From 9db87fce130bdcb4831631c46fbb9d5717472af2 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 7 Apr 2017 01:14:10 +0100
Subject: Protected tags changes from backend maintainer review

---
 app/models/concerns/protected_ref_access.rb | 2 +-
 app/models/protected_ref_matcher.rb         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/concerns/protected_ref_access.rb b/app/models/concerns/protected_ref_access.rb
index 0c7e5157cdf..c4f158e569a 100644
--- a/app/models/concerns/protected_ref_access.rb
+++ b/app/models/concerns/protected_ref_access.rb
@@ -11,7 +11,7 @@ module ProtectedRefAccess
   end
 
   def check_access(user)
-    return true if user.is_admin?
+    return true if user.admin?
 
     project.team.max_member_access(user.id) >= access_level
   end
diff --git a/app/models/protected_ref_matcher.rb b/app/models/protected_ref_matcher.rb
index 83f44240259..d970f2b01fc 100644
--- a/app/models/protected_ref_matcher.rb
+++ b/app/models/protected_ref_matcher.rb
@@ -4,7 +4,7 @@ class ProtectedRefMatcher
   end
 
   # Returns all protected refs that match the given ref name.
-  # This realizes all records from the scope built up so far, and does
+  # This checks all records from the scope built up so far, and does
   # _not_ return a relation.
   #
   # This method optionally takes in a list of `protected_refs` to search
@@ -38,6 +38,8 @@ class ProtectedRefMatcher
   end
 
   def wildcard_match?(ref_name)
+    return false unless wildcard?
+
     wildcard_regex === ref_name
   end
 
-- 
cgit v1.2.1


From 72419f3a8b94874de059f3567980844c7aaa6336 Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Fri, 7 Apr 2017 02:35:59 +0100
Subject: Documentation for protected tags

---
 app/views/projects/protected_tags/_create_protected_tag.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index 148efc16e64..6e187b54a59 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -12,11 +12,11 @@
           .col-md-10
             = render partial: "projects/protected_tags/dropdown", locals: { f: f }
             .help-block
-              = link_to 'Wildcards', help_page_path('user/project/protected_branches', anchor: 'wildcard-protected-branches')
+              = link_to 'Wildcards', help_page_path('user/project/protected_tags', anchor: 'wildcard-protected-tags')
               such as
-              %code *-stable
+              %code v*
               or
-              %code production/*
+              %code *-release
               are supported
         .form-group
           %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
-- 
cgit v1.2.1


From 4bf6ffa51a8e1ed67af2c31bde6b472c67b4a963 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 7 Apr 2017 00:07:39 -0500
Subject: Remove `undefined` class from `.emoji-menu-list`

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/30496
---
 app/assets/javascripts/awards_handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 67106e85a37..ce426741637 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -51,7 +51,7 @@ function renderCategory(name, emojiList, opts = {}) {
     <h5 class="emoji-menu-title">
       ${name}
     </h5>
-    <ul class="clearfix emoji-menu-list ${opts.menuListClass}">
+    <ul class="clearfix emoji-menu-list ${opts.menuListClass || ''}">
       ${emojiList.map(emojiName => `
         <li class="emoji-menu-list-item">
           <button class="emoji-menu-btn text-center js-emoji-btn" type="button">
-- 
cgit v1.2.1


From 6f15e89a6b83dcfef897dda414325b85090e2c40 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Fri, 7 Apr 2017 18:18:58 +0530
Subject: Show Flash message above Tags list

---
 app/assets/javascripts/protected_tags/protected_tag_edit.js | 2 +-
 app/assets/stylesheets/pages/projects.scss                  | 4 ++++
 app/views/projects/protected_tags/_tags_list.html.haml      | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index 624067a5a09..09a387c0f9e 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -43,7 +43,7 @@ export default class ProtectedTagEdit {
         },
       },
       error() {
-        new Flash('Failed to update tag!');
+        new Flash('Failed to update tag!', null, $('.js-protected-tags-list'));
       },
     }).always(() => {
       this.$allowedToCreateDropdownButton.enable();
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 61b973e0aa9..717ebb44a23 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -782,6 +782,10 @@ pre.light-well {
     width: 100%;
     max-width: 300px;
   }
+
+  .flash-container {
+    padding: 0;
+  }
 }
 
 .custom-notifications-form {
diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml
index cc006ed8a0b..728afd75b50 100644
--- a/app/views/projects/protected_tags/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/_tags_list.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default.protected-tags-list
+.panel.panel-default.protected-tags-list.js-protected-tags-list
   - if @protected_tags.empty?
     .panel-heading
       %h3.panel-title
@@ -21,6 +21,8 @@
           - if can_admin_project
             %th
       %tbody
+        %tr
+          %td.flash-container{ colspan: 4 }
         = render partial: 'projects/protected_tags/protected_tag', collection: @protected_tags, locals: { can_admin_project: can_admin_project}
 
     = paginate @protected_tags, theme: 'gitlab'
-- 
cgit v1.2.1


From 2548c155eed13c806951a6303c85dbb0c5772ca3 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 04:02:19 +0900
Subject: Add form for scheduled trigger

---
 .../projects/settings/ci_cd_controller.rb          |  1 +
 app/controllers/projects/triggers_controller.rb    | 10 ++++++++--
 app/models/ci/trigger.rb                           | 13 ++++++++++++
 app/models/ci/trigger_schedule.rb                  |  8 +++++++-
 app/views/projects/triggers/_form.html.haml        | 23 +++++++++++++++++++++-
 app/views/projects/triggers/_index.html.haml       |  2 ++
 app/views/projects/triggers/_trigger.html.haml     |  6 ++++++
 7 files changed, 59 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 6f009d61950..0ae4b4d3945 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -27,6 +27,7 @@ module Projects
       def define_triggers_variables
         @triggers = @project.triggers
         @trigger = Ci::Trigger.new
+        @trigger.build_trigger_schedule
       end
 
       def define_badges_variables
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index c47198c5eb6..5ceeeb1c454 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -68,10 +68,16 @@ class Projects::TriggersController < Projects::ApplicationController
   end
 
   def create_params
-    params.require(:trigger).permit(:description)
+    params.require(:trigger).permit(
+      :description, :ref, :trigger_schedule_on,
+      trigger_schedule_attributes: [ :cron, :cron_timezone ]
+    )
   end
 
   def update_params
-    params.require(:trigger).permit(:description)
+    params.require(:trigger).permit(
+      :description, :ref, :trigger_schedule_on,
+      trigger_schedule_attributes: [ :cron, :cron_timezone ]
+    )
   end
 end
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 0a89f3e0640..225b6253616 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -14,8 +14,21 @@ module Ci
 
     before_validation :set_default_values
 
+    accepts_nested_attributes_for :trigger_schedule
+
+    attr_accessor :trigger_schedule_on
+
     def set_default_values
       self.token = SecureRandom.hex(15) if self.token.blank?
+
+      if trigger_schedule_on.present?
+        if trigger_schedule_on.to_i == 1
+          self.trigger_schedule.project = project
+          self.trigger_schedule.trigger = self
+        else
+          self.trigger_schedule = nil
+        end
+      end
     end
 
     def last_trigger_request
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index 10ea381ee31..d8a2770ea61 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -8,7 +8,7 @@ module Ci
     belongs_to :project
     belongs_to :trigger
 
-    delegate :ref, to: :trigger
+    delegate :ref, to: :trigger, allow_nil: true
 
     validates :trigger, presence: { unless: :importing? }
     validates :cron, cron: true, presence: { unless: :importing? }
@@ -26,5 +26,11 @@ module Ci
     rescue ActiveRecord::RecordInvalid
       update_attribute(:next_run_at, nil) # update without validation
     end
+
+    def real_next_run(worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'],
+                      worker_time_zone: Time.zone.name)
+      Gitlab::Ci::CronParser.new(worker_cron, worker_time_zone)
+                            .next_time_from(next_run_at)
+    end
   end
 end
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 5f708b3a2ed..169f6c43225 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -6,6 +6,27 @@
       %label.label-light Token
       %p.form-control-static= @trigger.token
   .form-group
-    = f.label :key, "Description", class: "label-light"
+    = f.label :key, "Description (For extenral trigger and scheduled trigger)", class: "label-light"
     = f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
+  = f.fields_for :trigger_schedule do |schedule_fields|
+    .form-group
+      = schedule_fields.label :cron, "Cron (For scheduled trigger)", class: "label-light"
+      = schedule_fields.text_field :cron, class: "form-control", title: 'Trigger Schedule cron is required.', placeholder: "0 1 * * *"
+    .form-group
+      = schedule_fields.label :cron_timezone, "Cron timezone (For scheduled trigger)", class: "label-light"
+      = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Trigger Schedule cron_timezone is required.', placeholder: "UTC"
+    .form-group
+      = f.label :ref, "Ref (For scheduled trigger)", class: "label-light"
+      = f.text_field :ref, class: "form-control", title: 'Trigger Schedule Ref is required.', placeholder: "master"
+  - if action_name == 'edit'
+    = f.hidden_field :trigger_schedule_on, :value => @trigger.trigger_schedule.present? ? 1 : 0
+  - else
+    .form-group
+      .checkbox
+        = f.label :trigger_schedule_on do
+          = f.check_box :trigger_schedule_on
+          %strong Register as scheduled trigger
+        .help-block
+          If checked, this trigger will be executed periodically according to `cron`, `cron_timezone` and `ref`
+          = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines')
   = f.submit btn_text, class: "btn btn-save"
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml
index cc74e50a5e3..84e945ee0df 100644
--- a/app/views/projects/triggers/_index.html.haml
+++ b/app/views/projects/triggers/_index.html.haml
@@ -22,6 +22,8 @@
                 %th
                   %strong Last used
                 %th
+                  %strong Next run at
+                %th
               = render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger
         - else
           %p.settings-message.text-center.append-bottom-default
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 9b5f63ae81a..87d7c741bd6 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -29,6 +29,12 @@
     - else
       Never
 
+  %td
+    - if trigger.trigger_schedule.present?
+      = trigger.trigger_schedule.real_next_run
+    - else
+      N/A (External trigger)
+
   %td.text-right.trigger-actions
     - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
     - revoke_trigger_confirmation = "By revoking a trigger you will break any processes making use of it. Are you sure?"
-- 
cgit v1.2.1


From 76c0364ca52ce0b777f2ddb277fe666d95392256 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 15:52:25 +0900
Subject: Use allow_destroy. Remove condtion from form.haml.

---
 app/controllers/projects/triggers_controller.rb | 10 ++++++----
 app/models/ci/trigger.rb                        | 15 ++-------------
 app/models/ci/trigger_schedule.rb               |  5 +++--
 app/views/projects/triggers/_form.html.haml     |  7 ++-----
 4 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 5ceeeb1c454..2a3c563890b 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -16,6 +16,7 @@ class Projects::TriggersController < Projects::ApplicationController
     if @trigger.valid?
       flash[:notice] = 'Trigger was created successfully.'
     else
+      puts "@trigger.errors: #{@trigger.errors.inspect}"
       flash[:alert] = 'You could not create a new trigger.'
     end
 
@@ -33,6 +34,7 @@ class Projects::TriggersController < Projects::ApplicationController
   end
 
   def edit
+    @trigger.build_trigger_schedule unless @trigger.trigger_schedule.present?
   end
 
   def update
@@ -69,15 +71,15 @@ class Projects::TriggersController < Projects::ApplicationController
 
   def create_params
     params.require(:trigger).permit(
-      :description, :ref, :trigger_schedule_on,
-      trigger_schedule_attributes: [ :cron, :cron_timezone ]
+      :description, :ref,
+      trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ]
     )
   end
 
   def update_params
     params.require(:trigger).permit(
-      :description, :ref, :trigger_schedule_on,
-      trigger_schedule_attributes: [ :cron, :cron_timezone ]
+      :description, :ref,
+      trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ]
     )
   end
 end
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 225b6253616..f7ceba0d2a5 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -8,27 +8,16 @@ module Ci
     belongs_to :owner, class_name: "User"
 
     has_many :trigger_requests, dependent: :destroy
-    has_one :trigger_schedule, dependent: :destroy
+    has_one :trigger_schedule, dependent: :destroy, inverse_of: :trigger
 
     validates :token, presence: true, uniqueness: true
 
     before_validation :set_default_values
 
-    accepts_nested_attributes_for :trigger_schedule
-
-    attr_accessor :trigger_schedule_on
+    accepts_nested_attributes_for :trigger_schedule, allow_destroy: true
 
     def set_default_values
       self.token = SecureRandom.hex(15) if self.token.blank?
-
-      if trigger_schedule_on.present?
-        if trigger_schedule_on.to_i == 1
-          self.trigger_schedule.project = project
-          self.trigger_schedule.trigger = self
-        else
-          self.trigger_schedule = nil
-        end
-      end
     end
 
     def last_trigger_request
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index d8a2770ea61..f7d602920ba 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -6,11 +6,11 @@ module Ci
     acts_as_paranoid
 
     belongs_to :project
-    belongs_to :trigger
+    belongs_to :trigger, inverse_of: :trigger_schedule
 
     delegate :ref, to: :trigger, allow_nil: true
 
-    validates :trigger, presence: { unless: :importing? }
+    validates_presence_of :trigger
     validates :cron, cron: true, presence: { unless: :importing? }
     validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
@@ -19,6 +19,7 @@ module Ci
 
     def set_next_run_at
       self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
+      self.project = trigger.project
     end
 
     def schedule_next_run!
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 169f6c43225..c56ee3a1130 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -18,13 +18,10 @@
     .form-group
       = f.label :ref, "Ref (For scheduled trigger)", class: "label-light"
       = f.text_field :ref, class: "form-control", title: 'Trigger Schedule Ref is required.', placeholder: "master"
-  - if action_name == 'edit'
-    = f.hidden_field :trigger_schedule_on, :value => @trigger.trigger_schedule.present? ? 1 : 0
-  - else
     .form-group
       .checkbox
-        = f.label :trigger_schedule_on do
-          = f.check_box :trigger_schedule_on
+        = schedule_fields.label :_destroy do
+          = schedule_fields.check_box :_destroy, { checked: (@trigger.trigger_schedule.id.present?) }, 0, 1
           %strong Register as scheduled trigger
         .help-block
           If checked, this trigger will be executed periodically according to `cron`, `cron_timezone` and `ref`
-- 
cgit v1.2.1


From 4131ed2bd85d3efdfe0e27d47ffc95567dae11af Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 19:17:41 +0900
Subject: before_create :set_project. Now TriggerSchedule saves project from
 parent

---
 app/models/ci/trigger_schedule.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index f7d602920ba..bb58c510277 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -15,11 +15,15 @@ module Ci
     validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
 
+    before_create :set_project
     before_save :set_next_run_at
 
+    def set_project
+      self.project = trigger.project
+    end
+
     def set_next_run_at
       self.next_run_at = Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now)
-      self.project = trigger.project
     end
 
     def schedule_next_run!
-- 
cgit v1.2.1


From 2f5095c2546af30da152e85a499c98d608465988 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 19:24:20 +0900
Subject: Add def trigger_schedule in Trigger. Use persisted? for checling
 existance

---
 app/controllers/projects/settings/ci_cd_controller.rb | 1 -
 app/controllers/projects/triggers_controller.rb       | 1 -
 app/models/ci/trigger.rb                              | 4 ++++
 app/views/projects/triggers/_trigger.html.haml        | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 0ae4b4d3945..6f009d61950 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -27,7 +27,6 @@ module Projects
       def define_triggers_variables
         @triggers = @project.triggers
         @trigger = Ci::Trigger.new
-        @trigger.build_trigger_schedule
       end
 
       def define_badges_variables
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 2a3c563890b..4f5d336ce40 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -34,7 +34,6 @@ class Projects::TriggersController < Projects::ApplicationController
   end
 
   def edit
-    @trigger.build_trigger_schedule unless @trigger.trigger_schedule.present?
   end
 
   def update
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index f7ceba0d2a5..3358f901542 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -39,5 +39,9 @@ module Ci
     def can_access_project?
       self.owner_id.blank? || Ability.allowed?(self.owner, :create_build, project)
     end
+
+    def trigger_schedule
+      super || build_trigger_schedule
+    end
   end
 end
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 87d7c741bd6..9ab0cd3486c 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -30,7 +30,7 @@
       Never
 
   %td
-    - if trigger.trigger_schedule.present?
+    - if trigger.trigger_schedule.persisted?
       = trigger.trigger_schedule.real_next_run
     - else
       N/A (External trigger)
-- 
cgit v1.2.1


From fb8c49db8b16e45a33cff2839390bcbaab262075 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 19:28:04 +0900
Subject: create_params and update_params into trigger_params

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

(limited to 'app')

diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 4f5d336ce40..c1fc40f75d7 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -11,7 +11,7 @@ class Projects::TriggersController < Projects::ApplicationController
   end
 
   def create
-    @trigger = project.triggers.create(create_params.merge(owner: current_user))
+    @trigger = project.triggers.create(trigger_params.merge(owner: current_user))
 
     if @trigger.valid?
       flash[:notice] = 'Trigger was created successfully.'
@@ -37,7 +37,7 @@ class Projects::TriggersController < Projects::ApplicationController
   end
 
   def update
-    if trigger.update(update_params)
+    if trigger.update(trigger_params)
       redirect_to namespace_project_settings_ci_cd_path(@project.namespace, @project), notice: 'Trigger was successfully updated.'
     else
       render action: "edit"
@@ -68,17 +68,10 @@ class Projects::TriggersController < Projects::ApplicationController
     @trigger ||= project.triggers.find(params[:id]) || render_404
   end
 
-  def create_params
+  def trigger_params
     params.require(:trigger).permit(
       :description, :ref,
-      trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ]
-    )
-  end
-
-  def update_params
-    params.require(:trigger).permit(
-      :description, :ref,
-      trigger_schedule_attributes: [ :cron, :cron_timezone, :_destroy ]
+      trigger_schedule_attributes: [:cron, :cron_timezone, :_destroy]
     )
   end
 end
-- 
cgit v1.2.1


From 1ae1d85cdc835c8ed7907e83f3e371018c7c8fe6 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 7 Apr 2017 20:01:14 +0900
Subject: N/A to None. Revert validates from validates_presence_of.

---
 app/models/ci/trigger_schedule.rb              | 2 +-
 app/views/projects/triggers/_trigger.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index bb58c510277..72716eb416b 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -10,7 +10,7 @@ module Ci
 
     delegate :ref, to: :trigger, allow_nil: true
 
-    validates_presence_of :trigger
+    validates :trigger, presence: { unless: :importing? }
     validates :cron, cron: true, presence: { unless: :importing? }
     validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 9ab0cd3486c..3ed1fc9ac23 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -33,7 +33,7 @@
     - if trigger.trigger_schedule.persisted?
       = trigger.trigger_schedule.real_next_run
     - else
-      N/A (External trigger)
+      None (External trigger)
 
   %td.text-right.trigger-actions
     - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
-- 
cgit v1.2.1


From 03088552549ed1631bb16c1bf3d0bef3613ec793 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 14:47:29 +0200
Subject: Fix ref reference

---
 app/controllers/projects/triggers_controller.rb |  5 +--
 app/models/ci/trigger.rb                        |  4 +-
 app/models/ci/trigger_schedule.rb               | 17 ++++----
 app/views/projects/triggers/_form.html.haml     | 53 ++++++++++++++++---------
 app/views/projects/triggers/_trigger.html.haml  |  4 +-
 app/workers/trigger_schedule_worker.rb          |  2 +-
 6 files changed, 49 insertions(+), 36 deletions(-)

(limited to 'app')

diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index c1fc40f75d7..afa56de920b 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -16,7 +16,6 @@ class Projects::TriggersController < Projects::ApplicationController
     if @trigger.valid?
       flash[:notice] = 'Trigger was created successfully.'
     else
-      puts "@trigger.errors: #{@trigger.errors.inspect}"
       flash[:alert] = 'You could not create a new trigger.'
     end
 
@@ -70,8 +69,8 @@ class Projects::TriggersController < Projects::ApplicationController
 
   def trigger_params
     params.require(:trigger).permit(
-      :description, :ref,
-      trigger_schedule_attributes: [:cron, :cron_timezone, :_destroy]
+      :description,
+      trigger_schedule_attributes: [:id, :active, :cron, :cron_timezone, :ref]
     )
   end
 end
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 3358f901542..d01fad44fda 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -8,7 +8,7 @@ module Ci
     belongs_to :owner, class_name: "User"
 
     has_many :trigger_requests, dependent: :destroy
-    has_one :trigger_schedule, dependent: :destroy, inverse_of: :trigger
+    has_one :trigger_schedule, dependent: :destroy
 
     validates :token, presence: true, uniqueness: true
 
@@ -41,7 +41,7 @@ module Ci
     end
 
     def trigger_schedule
-      super || build_trigger_schedule
+      super || build_trigger_schedule(project: project)
     end
   end
 end
diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index 72716eb416b..c9a16643f32 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -6,20 +6,19 @@ module Ci
     acts_as_paranoid
 
     belongs_to :project
-    belongs_to :trigger, inverse_of: :trigger_schedule
-
-    delegate :ref, to: :trigger, allow_nil: true
+    belongs_to :trigger
 
     validates :trigger, presence: { unless: :importing? }
-    validates :cron, cron: true, presence: { unless: :importing? }
-    validates :cron_timezone, cron_timezone: true, presence: { unless: :importing? }
-    validates :ref, presence: { unless: :importing? }
+    validates :cron, unless: :importing_or_inactive?, cron: true, presence: { unless: :importing_or_inactive? }
+    validates :cron_timezone, cron_timezone: true, presence: { unless: :importing_or_inactive? }
+    validates :ref, presence: { unless: :importing_or_inactive? }
 
-    before_create :set_project
     before_save :set_next_run_at
 
-    def set_project
-      self.project = trigger.project
+    scope :active, -> { where(active: true) }
+
+    def importing_or_inactive?
+      importing? || !active?
     end
 
     def set_next_run_at
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index c56ee3a1130..410caeeecd4 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -6,24 +6,39 @@
       %label.label-light Token
       %p.form-control-static= @trigger.token
   .form-group
-    = f.label :key, "Description (For extenral trigger and scheduled trigger)", class: "label-light"
+    = f.label :key, "Description", class: "label-light"
     = f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
-  = f.fields_for :trigger_schedule do |schedule_fields|
-    .form-group
-      = schedule_fields.label :cron, "Cron (For scheduled trigger)", class: "label-light"
-      = schedule_fields.text_field :cron, class: "form-control", title: 'Trigger Schedule cron is required.', placeholder: "0 1 * * *"
-    .form-group
-      = schedule_fields.label :cron_timezone, "Cron timezone (For scheduled trigger)", class: "label-light"
-      = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Trigger Schedule cron_timezone is required.', placeholder: "UTC"
-    .form-group
-      = f.label :ref, "Ref (For scheduled trigger)", class: "label-light"
-      = f.text_field :ref, class: "form-control", title: 'Trigger Schedule Ref is required.', placeholder: "master"
-    .form-group
-      .checkbox
-        = schedule_fields.label :_destroy do
-          = schedule_fields.check_box :_destroy, { checked: (@trigger.trigger_schedule.id.present?) }, 0, 1
-          %strong Register as scheduled trigger
-        .help-block
-          If checked, this trigger will be executed periodically according to `cron`, `cron_timezone` and `ref`
-          = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines')
+    - if @trigger.persisted?
+      %hr
+      = f.fields_for :trigger_schedule do |schedule_fields|
+        = schedule_fields.hidden_field :id
+        .form-group
+          .checkbox
+            = schedule_fields.label :active do
+              = schedule_fields.check_box :active
+              %strong Schedule trigger
+            .help-block
+              If checked, this trigger will be executed periodically according to `cron`, `cron_timezone` and `ref`
+              = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines')
+        .form-group
+          = schedule_fields.label :cron, "Cron", class: "label-light"
+          = schedule_fields.text_field :cron, class: "form-control", title: 'Trigger Schedule cron is required.', placeholder: "0 1 * * *"
+        .form-group
+          = schedule_fields.label :cron, "Timezone", class: "label-light"
+          = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Trigger Schedule cron_timezone is required.', placeholder: "UTC"
+        .form-group
+          - schedule_ref = @trigger.trigger_schedule.ref || @project.default_branch
+          = schedule_fields.label :ref, "Branch or tag", class: "label-light"
+          = hidden_field_tag 'trigger[trigger_schedule_attributes][ref]', schedule_ref
+          = dropdown_tag(schedule_ref,
+                         options: { toggle_class: 'js-branch-select wide',
+                                    filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search branches",
+                                    data: { selected: schedule_ref, field_name: 'trigger[trigger_schedule_attributes][ref]' } })
+          .help-block Existing branch name, tag
   = f.submit btn_text, class: "btn btn-save"
+
+
+:javascript
+  var availableRefs = #{@project.repository.ref_names.to_json};
+
+  new NewBranchForm($('.js-new-pipeline-form'), availableRefs)
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 3ed1fc9ac23..71fb37928fe 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -30,10 +30,10 @@
       Never
 
   %td
-    - if trigger.trigger_schedule.persisted?
+    - if trigger.trigger_schedule.present? && trigger.trigger_schedule.active?
       = trigger.trigger_schedule.real_next_run
     - else
-      None (External trigger)
+      None
 
   %td.text-right.trigger-actions
     - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
diff --git a/app/workers/trigger_schedule_worker.rb b/app/workers/trigger_schedule_worker.rb
index 440c579b99d..9c1baf7e6c5 100644
--- a/app/workers/trigger_schedule_worker.rb
+++ b/app/workers/trigger_schedule_worker.rb
@@ -3,7 +3,7 @@ class TriggerScheduleWorker
   include CronjobQueue
 
   def perform
-    Ci::TriggerSchedule.where("next_run_at < ?", Time.now).find_each do |trigger_schedule|
+    Ci::TriggerSchedule.active.where("next_run_at < ?", Time.now).find_each do |trigger_schedule|
       begin
         Ci::CreateTriggerRequestService.new.execute(trigger_schedule.project,
                                                     trigger_schedule.trigger,
-- 
cgit v1.2.1


From 21a7aed9a7330382300bc93b8927609e65ee6390 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 16:02:13 +0200
Subject: Update tests to cover trigger schedule

---
 app/views/projects/triggers/_form.html.haml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'app')

diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 410caeeecd4..41e73f1e822 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -16,24 +16,19 @@
           .checkbox
             = schedule_fields.label :active do
               = schedule_fields.check_box :active
-              %strong Schedule trigger
+              %strong Schedule trigger (experimental)
             .help-block
-              If checked, this trigger will be executed periodically according to `cron`, `cron_timezone` and `ref`
-              = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines')
+              If checked, this trigger will be executed periodically according to `Cron` and `Timezone`.
+              = link_to icon('question-circle'), help_page_path('ci/triggers', anchor: 'schedule')
         .form-group
           = schedule_fields.label :cron, "Cron", class: "label-light"
-          = schedule_fields.text_field :cron, class: "form-control", title: 'Trigger Schedule cron is required.', placeholder: "0 1 * * *"
+          = schedule_fields.text_field :cron, class: "form-control", title: 'Cron specification is required.', placeholder: "0 1 * * *"
         .form-group
           = schedule_fields.label :cron, "Timezone", class: "label-light"
-          = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Trigger Schedule cron_timezone is required.', placeholder: "UTC"
+          = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Timezone is required.', placeholder: "UTC"
         .form-group
-          - schedule_ref = @trigger.trigger_schedule.ref || @project.default_branch
           = schedule_fields.label :ref, "Branch or tag", class: "label-light"
-          = hidden_field_tag 'trigger[trigger_schedule_attributes][ref]', schedule_ref
-          = dropdown_tag(schedule_ref,
-                         options: { toggle_class: 'js-branch-select wide',
-                                    filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search branches",
-                                    data: { selected: schedule_ref, field_name: 'trigger[trigger_schedule_attributes][ref]' } })
+          = schedule_fields.text_field :ref, class: "form-control", title: 'Branch or tag is required.', placeholder: "master"
           .help-block Existing branch name, tag
   = f.submit btn_text, class: "btn btn-save"
 
-- 
cgit v1.2.1


From 7461072f36d88254b2bc5d696061c7c0f5b8fe86 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 16:13:21 +0200
Subject: Update code to remove no longer needed changes

---
 app/models/ci/trigger.rb                    | 2 +-
 app/views/projects/triggers/_form.html.haml | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index d01fad44fda..b59e235c425 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -14,7 +14,7 @@ module Ci
 
     before_validation :set_default_values
 
-    accepts_nested_attributes_for :trigger_schedule, allow_destroy: true
+    accepts_nested_attributes_for :trigger_schedule
 
     def set_default_values
       self.token = SecureRandom.hex(15) if self.token.blank?
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 41e73f1e822..8ec2f05e3d6 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -31,9 +31,3 @@
           = schedule_fields.text_field :ref, class: "form-control", title: 'Branch or tag is required.', placeholder: "master"
           .help-block Existing branch name, tag
   = f.submit btn_text, class: "btn btn-save"
-
-
-:javascript
-  var availableRefs = #{@project.repository.ref_names.to_json};
-
-  new NewBranchForm($('.js-new-pipeline-form'), availableRefs)
-- 
cgit v1.2.1


From 344001d7384ec227fdf18cc87b62981f18c7c580 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 16:20:00 +0200
Subject: Simplify if

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

(limited to 'app')

diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 71fb37928fe..ca4549fc557 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -30,7 +30,7 @@
       Never
 
   %td
-    - if trigger.trigger_schedule.present? && trigger.trigger_schedule.active?
+    - if trigger.trigger_schedule&.active?
       = trigger.trigger_schedule.real_next_run
     - else
       None
-- 
cgit v1.2.1


From d5201119ee2a139c18b51babd80f6c6490f90b6e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 17:15:28 +0200
Subject: Fix test failures

---
 app/models/ci/trigger_schedule.rb              | 5 +++--
 app/views/projects/triggers/_form.html.haml    | 2 +-
 app/views/projects/triggers/_trigger.html.haml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/trigger_schedule.rb b/app/models/ci/trigger_schedule.rb
index c9a16643f32..012a18eb439 100644
--- a/app/models/ci/trigger_schedule.rb
+++ b/app/models/ci/trigger_schedule.rb
@@ -31,8 +31,9 @@ module Ci
       update_attribute(:next_run_at, nil) # update without validation
     end
 
-    def real_next_run(worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'],
-                      worker_time_zone: Time.zone.name)
+    def real_next_run(
+        worker_cron: Settings.cron_jobs['trigger_schedule_worker']['cron'],
+        worker_time_zone: Time.zone.name)
       Gitlab::Ci::CronParser.new(worker_cron, worker_time_zone)
                             .next_time_from(next_run_at)
     end
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 8ec2f05e3d6..8582bcbb8cc 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -18,7 +18,7 @@
               = schedule_fields.check_box :active
               %strong Schedule trigger (experimental)
             .help-block
-              If checked, this trigger will be executed periodically according to `Cron` and `Timezone`.
+              If checked, this trigger will be executed periodically according to cron and timezone.
               = link_to icon('question-circle'), help_page_path('ci/triggers', anchor: 'schedule')
         .form-group
           = schedule_fields.label :cron, "Cron", class: "label-light"
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index ca4549fc557..ebd91a8e2af 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -33,7 +33,7 @@
     - if trigger.trigger_schedule&.active?
       = trigger.trigger_schedule.real_next_run
     - else
-      None
+      Never
 
   %td.text-right.trigger-actions
     - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
-- 
cgit v1.2.1


From 9082d1e046a8da394ea0b271f9f3fea909bb102c Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Thu, 30 Mar 2017 09:05:02 +0200
Subject: Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus

---
 app/models/ci/pipeline.rb        |  2 +-
 app/models/ci/pipeline_status.rb | 86 ----------------------------------------
 app/models/project.rb            |  2 +-
 3 files changed, 2 insertions(+), 88 deletions(-)
 delete mode 100644 app/models/ci/pipeline_status.rb

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 37a81fa7781..8ee1a0580e1 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -394,7 +394,7 @@ module Ci
     end
 
     def refresh_build_status_cache
-      Ci::PipelineStatus.new(project, sha: sha, status: status).store_in_cache_if_needed
+      Gitlab::Cache::Ci::ProjectBuildStatus.new(project, sha: sha, status: status).store_in_cache_if_needed
     end
 
     private
diff --git a/app/models/ci/pipeline_status.rb b/app/models/ci/pipeline_status.rb
deleted file mode 100644
index 048047d0e34..00000000000
--- a/app/models/ci/pipeline_status.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# This class is not backed by a table in the main database.
-# It loads the latest Pipeline for the HEAD of a repository, and caches that
-# in Redis.
-module Ci
-  class PipelineStatus
-    attr_accessor :sha, :status, :project, :loaded
-
-    delegate :commit, to: :project
-
-    def self.load_for_project(project)
-      new(project).tap do |status|
-        status.load_status
-      end
-    end
-
-    def initialize(project, sha: nil, status: nil)
-      @project = project
-      @sha = sha
-      @status = status
-    end
-
-    def has_status?
-      loaded? && sha.present? && status.present?
-    end
-
-    def load_status
-      return if loaded?
-
-      if has_cache?
-        load_from_cache
-      else
-        load_from_commit
-        store_in_cache
-      end
-
-      self.loaded = true
-    end
-
-    def load_from_commit
-      return unless commit
-
-      self.sha = commit.sha
-      self.status = commit.status
-    end
-
-    # We only cache the status for the HEAD commit of a project
-    # This status is rendered in project lists
-    def store_in_cache_if_needed
-      return unless sha
-      return delete_from_cache unless commit
-      store_in_cache if commit.sha == self.sha
-    end
-
-    def load_from_cache
-      Gitlab::Redis.with do |redis|
-        self.sha, self.status = redis.hmget(cache_key, :sha, :status)
-      end
-    end
-
-    def store_in_cache
-      Gitlab::Redis.with do |redis|
-        redis.mapped_hmset(cache_key, { sha: sha, status: status })
-      end
-    end
-
-    def delete_from_cache
-      Gitlab::Redis.with do |redis|
-        redis.del(cache_key)
-      end
-    end
-
-    def has_cache?
-      Gitlab::Redis.with do |redis|
-        redis.exists(cache_key)
-      end
-    end
-
-    def loaded?
-      self.loaded
-    end
-
-    def cache_key
-      "projects/#{project.id}/build_status"
-    end
-  end
-end
diff --git a/app/models/project.rb b/app/models/project.rb
index 639615b91a2..f6b66232346 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1197,7 +1197,7 @@ class Project < ActiveRecord::Base
   end
 
   def pipeline_status
-    @pipeline_status ||= Ci::PipelineStatus.load_for_project(self)
+    @pipeline_status ||= Gitlab::Cache::Ci::ProjectBuildStatus.load_for_project(self)
   end
 
   def mark_import_as_failed(error_message)
-- 
cgit v1.2.1


From 47abf00b24efb0f6263ea37eddf2d6587950c5ee Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Thu, 30 Mar 2017 09:15:42 +0200
Subject: Update project build status cache when transitioning

---
 app/models/ci/pipeline.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 8ee1a0580e1..b1cabbcd53e 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -31,7 +31,6 @@ module Ci
     validate :valid_commit_sha, unless: :importing?
 
     after_create :keep_around_commits, unless: :importing?
-    after_create :refresh_build_status_cache
 
     state_machine :status, initial: :created do
       event :enqueue do
@@ -99,6 +98,7 @@ module Ci
           PipelineHooksWorker.perform_async(id)
           Ci::ExpirePipelineCacheService.new(project, nil)
             .execute(pipeline)
+          refresh_project_build_status_cache
         end
       end
 
@@ -351,7 +351,6 @@ module Ci
         when 'manual' then block
         end
       end
-      refresh_build_status_cache
     end
 
     def predefined_variables
@@ -393,7 +392,7 @@ module Ci
         .fabricate!
     end
 
-    def refresh_build_status_cache
+    def refresh_project_build_status_cache
       Gitlab::Cache::Ci::ProjectBuildStatus.new(project, sha: sha, status: status).store_in_cache_if_needed
     end
 
-- 
cgit v1.2.1


From a6d313001a9df7f44402b1a0fca8bbd631b9fd87 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Fri, 31 Mar 2017 15:47:34 +0200
Subject: Wrap updating of cache after pipeline transition in class method

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

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index b1cabbcd53e..1506a6bf6ab 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -393,7 +393,7 @@ module Ci
     end
 
     def refresh_project_build_status_cache
-      Gitlab::Cache::Ci::ProjectBuildStatus.new(project, sha: sha, status: status).store_in_cache_if_needed
+      Gitlab::Cache::Ci::ProjectBuildStatus.update_for_pipeline(self)
     end
 
     private
-- 
cgit v1.2.1


From 02072e17ab484d7c99dc485fc3ef8348f8da8bf1 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Mon, 3 Apr 2017 09:09:11 +0200
Subject: Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`

---
 app/models/ci/pipeline.rb | 2 +-
 app/models/project.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 1506a6bf6ab..b8d77e62494 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -393,7 +393,7 @@ module Ci
     end
 
     def refresh_project_build_status_cache
-      Gitlab::Cache::Ci::ProjectBuildStatus.update_for_pipeline(self)
+      Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(self)
     end
 
     private
diff --git a/app/models/project.rb b/app/models/project.rb
index f6b66232346..5ff997faa63 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1197,7 +1197,7 @@ class Project < ActiveRecord::Base
   end
 
   def pipeline_status
-    @pipeline_status ||= Gitlab::Cache::Ci::ProjectBuildStatus.load_for_project(self)
+    @pipeline_status ||= Gitlab::Cache::Ci::ProjectPipelineStatus.load_for_project(self)
   end
 
   def mark_import_as_failed(error_message)
-- 
cgit v1.2.1


From 9eded57dd2b4d23e43b485c448abb92359e6933e Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Fri, 7 Apr 2017 10:56:35 +0200
Subject: Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`

---
 app/models/ci/pipeline.rb                        | 5 -----
 app/services/ci/expire_pipeline_cache_service.rb | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index b8d77e62494..445247f1b41 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -98,7 +98,6 @@ module Ci
           PipelineHooksWorker.perform_async(id)
           Ci::ExpirePipelineCacheService.new(project, nil)
             .execute(pipeline)
-          refresh_project_build_status_cache
         end
       end
 
@@ -392,10 +391,6 @@ module Ci
         .fabricate!
     end
 
-    def refresh_project_build_status_cache
-      Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(self)
-    end
-
     private
 
     def pipeline_data
diff --git a/app/services/ci/expire_pipeline_cache_service.rb b/app/services/ci/expire_pipeline_cache_service.rb
index c0e4a798f6a..91d9c1d2ba1 100644
--- a/app/services/ci/expire_pipeline_cache_service.rb
+++ b/app/services/ci/expire_pipeline_cache_service.rb
@@ -10,6 +10,8 @@ module Ci
       store.touch(commit_pipelines_path) if pipeline.commit
       store.touch(new_merge_request_pipelines_path)
       merge_requests_pipelines_paths.each { |path| store.touch(path) }
+
+      Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(@pipeline)
     end
 
     private
-- 
cgit v1.2.1


From ac35566403652fc5cea0c42b273169584e5c9ce2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 7 Apr 2017 13:11:42 +0100
Subject: Fixed duplicate jQuery AJAX spyon

---
 app/assets/javascripts/merge_request_tabs.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 8528e0800ae..7f6c74ce39a 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -102,10 +102,10 @@ import './flash';
 
     destroyPipelinesView() {
       if (this.commitPipelinesTable) {
-        document.querySelector('#commit-pipeline-table-view')
-          .removeChild(this.commitPipelinesTable.$el);
-
         this.commitPipelinesTable.$destroy();
+        this.commitPipelinesTable = null;
+
+        document.querySelector('#commit-pipeline-table-view').innerHTML = '';
       }
     }
 
-- 
cgit v1.2.1


From 16a2eba52b8286533d881ec1a0454ca734d41c3f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 7 Apr 2017 17:06:41 +0200
Subject: Count number of queries

---
 app/controllers/projects/builds_controller.rb | 5 +++++
 app/models/concerns/has_status.rb             | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index add66ce9f84..04e8cdf6256 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -19,6 +19,11 @@ class Projects::BuildsController < Projects::ApplicationController
       else
         @builds
       end
+    @builds = @builds.includes([
+      { pipeline: :project },
+      :project,
+      :tags
+    ])
     @builds = @builds.page(params[:page]).per(30)
   end
 
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 2f61709110c..dff7b6e3523 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -68,7 +68,7 @@ module HasStatus
     end
 
     scope :created, -> { where(status: 'created') }
-    scope :relevant, -> { where.not(status: 'created') }
+    scope :relevant, -> { where(status: AVAILABLE_STATUSES - ['created']) }
     scope :running, -> { where(status: 'running') }
     scope :pending, -> { where(status: 'pending') }
     scope :success, -> { where(status: 'success') }
-- 
cgit v1.2.1


From 4bdbccfc066b3ff1ed3bd29a6266215ed2421df3 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mgreiling@gitlab.com>
Date: Fri, 7 Apr 2017 19:36:09 +0000
Subject: Remove Vue from main bundle and disable production warnings

---
 app/assets/javascripts/boards/boards_bundle.js              |  4 ++++
 app/assets/javascripts/commit/pipelines/pipelines_bundle.js | 12 +++++-------
 app/assets/javascripts/merge_request_tabs.js                |  5 +----
 app/assets/javascripts/milestone_select.js                  |  6 ++----
 app/assets/javascripts/subscription.js                      |  5 +----
 app/assets/javascripts/users_select.js                      |  8 +++-----
 6 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/boards/boards_bundle.js b/app/assets/javascripts/boards/boards_bundle.js
index e057ac8df02..37094c5c9be 100644
--- a/app/assets/javascripts/boards/boards_bundle.js
+++ b/app/assets/javascripts/boards/boards_bundle.js
@@ -38,6 +38,10 @@ $(() => {
 
   Store.create();
 
+  // hack to allow sidebar scripts like milestone_select manipulate the BoardsStore
+  gl.issueBoards.boardStoreIssueSet = (...args) => Vue.set(Store.detail.issue, ...args);
+  gl.issueBoards.boardStoreIssueDelete = (...args) => Vue.delete(Store.detail.issue, ...args);
+
   gl.IssueBoardsApp = new Vue({
     el: $boardApp,
     components: {
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
index 5f3ed9374bf..86d99dd87da 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+++ b/app/assets/javascripts/commit/pipelines/pipelines_bundle.js
@@ -12,20 +12,18 @@ Vue.use(VueResource);
  * Renders Pipelines table in pipelines tab in the commits show view.
  */
 
+// export for use in merge_request_tabs.js (TODO: remove this hack)
+window.gl = window.gl || {};
+window.gl.CommitPipelinesTable = CommitPipelinesTable;
+
 $(() => {
-  window.gl = window.gl || {};
   gl.commits = gl.commits || {};
   gl.commits.pipelines = gl.commits.pipelines || {};
 
-  if (gl.commits.PipelinesTableBundle) {
-    document.querySelector('#commit-pipeline-table-view').removeChild(this.pipelinesTableBundle.$el);
-    gl.commits.PipelinesTableBundle.$destroy(true);
-  }
-
   const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view');
 
   if (pipelineTableViewEl && pipelineTableViewEl.dataset.disableInitialization === undefined) {
     gl.commits.pipelines.PipelinesTableBundle = new CommitPipelinesTable().$mount();
-    document.querySelector('#commit-pipeline-table-view').appendChild(gl.commits.pipelines.PipelinesTableBundle.$el);
+    pipelineTableViewEl.appendChild(gl.commits.pipelines.PipelinesTableBundle.$el);
   }
 });
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 7f6c74ce39a..f7f6a773036 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -3,9 +3,6 @@
 /* global Flash */
 
 import Cookies from 'js-cookie';
-
-import CommitPipelinesTable from './commit/pipelines/pipelines_table';
-
 import './breakpoints';
 import './flash';
 
@@ -234,7 +231,7 @@ import './flash';
     }
 
     mountPipelinesView() {
-      this.commitPipelinesTable = new CommitPipelinesTable().$mount();
+      this.commitPipelinesTable = new gl.CommitPipelinesTable().$mount();
       // $mount(el) replaces the el with the new rendered component. We need it in order to mount
       // it everytime this tab is clicked - https://vuejs.org/v2/api/#vm-mount
       document.querySelector('#commit-pipeline-table-view')
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js
index ac4fad88fe5..773fe3233a7 100644
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -2,8 +2,6 @@
 /* global Issuable */
 /* global ListMilestone */
 
-import Vue from 'vue';
-
 (function() {
   this.MilestoneSelect = (function() {
     function MilestoneSelect(currentProject, els) {
@@ -151,12 +149,12 @@ import Vue from 'vue';
               return $dropdown.closest('form').submit();
             } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
               if (selected.id !== -1) {
-                Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'milestone', new ListMilestone({
+                gl.issueBoards.boardStoreIssueSet('milestone', new ListMilestone({
                   id: selected.id,
                   title: selected.name
                 }));
               } else {
-                Vue.delete(gl.issueBoards.BoardsStore.detail.issue, 'milestone');
+                gl.issueBoards.boardStoreIssueDelete('milestone');
               }
 
               $dropdown.trigger('loading.gl.dropdown');
diff --git a/app/assets/javascripts/subscription.js b/app/assets/javascripts/subscription.js
index 9c307915ec4..5f9a3e00c22 100644
--- a/app/assets/javascripts/subscription.js
+++ b/app/assets/javascripts/subscription.js
@@ -1,5 +1,3 @@
-import Vue from 'vue';
-
 (() => {
   class Subscription {
     constructor(containerElm) {
@@ -29,8 +27,7 @@ import Vue from 'vue';
 
         // hack to allow this to work with the issue boards Vue object
         if (document.querySelector('html').classList.contains('issue-boards-page')) {
-          Vue.set(
-            gl.issueBoards.BoardsStore.detail.issue,
+          gl.issueBoards.boardStoreIssueSet(
             'subscribed',
             !gl.issueBoards.BoardsStore.detail.issue.subscribed,
           );
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index 48e20cf501f..3325a7d429c 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -2,8 +2,6 @@
 /* global Issuable */
 /* global ListUser */
 
-import Vue from 'vue';
-
 (function() {
   var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; },
     slice = [].slice;
@@ -74,7 +72,7 @@ import Vue from 'vue';
             e.preventDefault();
 
             if ($dropdown.hasClass('js-issue-board-sidebar')) {
-              Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'assignee', new ListUser({
+              gl.issueBoards.boardStoreIssueSet('assignee', new ListUser({
                 id: _this.currentUser.id,
                 username: _this.currentUser.username,
                 name: _this.currentUser.name,
@@ -225,14 +223,14 @@ import Vue from 'vue';
                 return $dropdown.closest('form').submit();
               } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
                 if (user.id) {
-                  Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'assignee', new ListUser({
+                  gl.issueBoards.boardStoreIssueSet('assignee', new ListUser({
                     id: user.id,
                     username: user.username,
                     name: user.name,
                     avatar_url: user.avatar_url
                   }));
                 } else {
-                  Vue.delete(gl.issueBoards.BoardsStore.detail.issue, 'assignee');
+                  gl.issueBoards.boardStoreIssueDelete('assignee');
                 }
 
                 updateIssueBoardsIssue();
-- 
cgit v1.2.1