From 00eb49d0a6debc47e4336143bb8646b225a72ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 26 Jun 2018 19:23:47 +0200
Subject: [PATCH 01/57] Add simple data models

---
 app/models/project.rb                         |  3 ++
 app/models/project_feature_flag.rb            | 12 +++++++
 .../project_feature_flag_access_token.rb      | 10 ++++++
 ...626171125_add_feature_flags_to_projects.rb | 31 +++++++++++++++++++
 lib/gitlab/regex.rb                           |  9 ++++++
 5 files changed, 65 insertions(+)
 create mode 100644 app/models/project_feature_flag.rb
 create mode 100644 app/models/project_feature_flag_access_token.rb
 create mode 100644 db/migrate/20180626171125_add_feature_flags_to_projects.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index 9eee28ad0f455d..9e5b6cbc226c50 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -266,6 +266,9 @@ class Project < ActiveRecord::Base
   has_many :project_deploy_tokens
   has_many :deploy_tokens, through: :project_deploy_tokens
 
+  has_many :project_feature_flags
+  has_many :project_feature_flags_access_tokens
+
   has_one :auto_devops, class_name: 'ProjectAutoDevops'
   has_many :custom_attributes, class_name: 'ProjectCustomAttribute'
 
diff --git a/app/models/project_feature_flag.rb b/app/models/project_feature_flag.rb
new file mode 100644
index 00000000000000..11681f555de3f4
--- /dev/null
+++ b/app/models/project_feature_flag.rb
@@ -0,0 +1,12 @@
+class ProjectFeatureFlag < ActiveRecord::Base
+  belongs_to :project
+
+  validates :project, presence: true
+  validates :name,
+    presence: true,
+    length: 2..63,
+    format: {
+      with: Gitlab::Regex.feature_flag_regex,
+      message: Gitlab::Regex.feature_flag_regex_message
+    }
+end
diff --git a/app/models/project_feature_flag_access_token.rb b/app/models/project_feature_flag_access_token.rb
new file mode 100644
index 00000000000000..986685e9ee1c1a
--- /dev/null
+++ b/app/models/project_feature_flag_access_token.rb
@@ -0,0 +1,10 @@
+class ProjectFeatureFlagAccessToken < ActiveRecord::Base
+  include TokenAuthenticatable
+
+  belongs_to :project
+
+  validates :project, presence: true
+  validates :token, presence: true
+
+  add_authentication_token_field :token
+end
diff --git a/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
new file mode 100644
index 00000000000000..9fe3d8433e48a4
--- /dev/null
+++ b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -0,0 +1,31 @@
+class AddFeatureFlagsToProjects < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def change
+    create_table :project_feature_flags do |t|
+      t.integer :project_id, null: false
+      t.datetime_with_timezone :created_at, null: false
+      t.datetime_with_timezone :updated_at, null: false
+
+      t.string :name, null: false
+      t.text :description
+      t.boolean :active, null: false
+
+      t.foreign_key :projects, column: :project_id, on_delete: :cascade
+
+      t.index [:project_id, :name], unique: true
+    end
+
+    create_table :project_feature_flag_access_tokens do |t|
+      t.integer :project_id, null: false
+      t.string :token, null: false
+
+      t.index [:project_id, :token], unique: true, name: :project_feature_flag_access_token
+
+      t.foreign_key :projects, column: :project_id, on_delete: :cascade
+    end
+  end
+end
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 2a1231f5821d2f..f5c81bbc20044f 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -71,6 +71,15 @@ def environment_slug_regex_message
       "Must start with a letter, and cannot end with '-'"
     end
 
+    def feature_flag_regex
+      /\A[a-z]([-a-z0-9]*[a-z0-9])?\z/
+    end
+
+    def feature_flag_regex_message
+      "can contain only lowercase letters, digits, '_' and '-'. " \
+      "Must start with a letter, and cannot end with '-'"
+    end
+
     def build_trace_section_regex
       @build_trace_section_regexp ||= /section_((?:start)|(?:end)):(\d+):([a-zA-Z0-9_.-]+)\r\033\[0K/.freeze
     end
-- 
GitLab


From 9aba3a901fffb56d15af725a993590af1b467210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 21 Jun 2018 18:42:41 +0200
Subject: [PATCH 02/57] Add Unleash API compatible interface

---
 lib/api/api.rb      |  1 +
 lib/api/entities.rb | 34 ++++++++++++++++++++++++++++++++++
 lib/api/unleash.rb  | 25 +++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 lib/api/unleash.rb

diff --git a/lib/api/api.rb b/lib/api/api.rb
index c2208df334b8b3..5ce0733b38b134 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -158,6 +158,7 @@ class API < Grape::API
     mount ::API::Templates
     mount ::API::Todos
     mount ::API::Triggers
+    mount ::API::Unleash
     mount ::API::Users
     mount ::API::Variables
     mount ::API::Version
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 3a68da2a2bb906..d2835d8e926780 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1515,6 +1515,40 @@ class ResourceLabelEvent < Grape::Entity
       end
       expose :label, using: Entities::LabelBasic
       expose :action
+
+    class UnleashIssue < Grape::Entity
+      expose :name
+      expose :title, as: :description
+      expose :enabled
+      expose :strategies
+
+      private
+
+      def name
+        "\##{object.iid}"
+      end
+
+      def enabled
+        true
+      end
+
+      def strategies
+        [{ name: 'default' }]
+      end
+    end
+
+    class UnleashFeatureResponse < Grape::Entity
+      expose :version
+      expose :features, with: UnleashIssue
+
+      private
+
+      def version
+        1
+      end
+
+      def features
+      end
     end
   end
 end
diff --git a/lib/api/unleash.rb b/lib/api/unleash.rb
new file mode 100644
index 00000000000000..249dff336749bf
--- /dev/null
+++ b/lib/api/unleash.rb
@@ -0,0 +1,25 @@
+module API
+  class Unleash < Grape::API
+    include PaginationParams
+
+    #before { authenticate! }
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+    end
+    resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
+      get ':id/unleash/features' do
+        issues = IssuesFinder.new(current_user, project_id: user_project.id, label_name: 'rollout')
+        present issues, with: Entities::UnleashFeatureResponse
+      end
+
+      post ':id/unleash/client/register' do
+        status :ok
+      end
+
+      post ':id/unleash/client/metrics' do
+        status :ok
+      end
+    end
+  end
+end
-- 
GitLab


From 23e06634c3604ac484b486c73037fcd9fb0eda3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 26 Jun 2018 20:53:47 +0200
Subject: [PATCH 03/57] Add feature flags backend controls

---
 .../projects/feature_flags_controller.rb      | 57 +++++++++++++++++++
 app/helpers/projects_helper.rb                |  3 +-
 ... => project_feature_flags_access_token.rb} |  4 +-
 app/policies/project_policy.rb                |  6 ++
 .../layouts/nav/sidebar/_project.html.haml    | 14 +++--
 .../projects/feature_flags/_form.html.haml    | 25 ++++++++
 .../projects/feature_flags/_list.html.haml    | 17 ++++++
 .../projects/feature_flags/_use.html.haml     | 23 ++++++++
 .../projects/feature_flags/edit.html.haml     | 11 ++++
 .../projects/feature_flags/index.html.haml    | 16 ++++++
 .../projects/feature_flags/new.html.haml      | 12 ++++
 config/routes/project.rb                      |  2 +
 ...626171125_add_feature_flags_to_projects.rb |  2 +-
 db/schema.rb                                  | 20 +++++++
 lib/api/entities.rb                           | 26 ++-------
 lib/api/unleash.rb                            | 38 +++++++++----
 lib/gitlab/regex.rb                           |  4 +-
 17 files changed, 240 insertions(+), 40 deletions(-)
 create mode 100644 app/controllers/projects/feature_flags_controller.rb
 rename app/models/{project_feature_flag_access_token.rb => project_feature_flags_access_token.rb} (64%)
 create mode 100644 app/views/projects/feature_flags/_form.html.haml
 create mode 100644 app/views/projects/feature_flags/_list.html.haml
 create mode 100644 app/views/projects/feature_flags/_use.html.haml
 create mode 100644 app/views/projects/feature_flags/edit.html.haml
 create mode 100644 app/views/projects/feature_flags/index.html.haml
 create mode 100644 app/views/projects/feature_flags/new.html.haml

diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
new file mode 100644
index 00000000000000..60d0c4668a6c09
--- /dev/null
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -0,0 +1,57 @@
+class Projects::FeatureFlagsController < Projects::ApplicationController
+  respond_to :html
+
+  before_action :authorize_read_feature_flags!
+  before_action :authorize_update_feature_flags!, only: [:edit, :update]
+  before_action :authorize_admin_feature_flags!, only: [:destroy]
+
+  before_action :feature_flag, only: [:edit, :update, :destroy]
+
+  def index
+    @feature_flags = project.project_feature_flags
+    @unleash_instanceid = project.project_feature_flags_access_tokens.first&.token || project.project_feature_flags_access_tokens.create!.token
+  end
+
+  def new
+    @feature_flag = project.project_feature_flags.new
+  end
+
+  def create
+    @feature_flag = project.project_feature_flags.create(create_params)
+
+    if @feature_flag.persisted?
+      flash[:notice] = 'Feature flag was successfully created.'
+      redirect_to project_feature_flags_path(@project)
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if feature_flag.update(update_params)
+      flash[:notice] = 'Feature flag was successfully updated.'
+      redirect_to project_feature_flags_path(@project)
+    else
+      render :edit
+    end
+  end
+
+  protected
+
+  def feature_flag
+    @feature_flag ||= project.project_feature_flags.find(params[:id])
+  end
+
+  def create_params
+    params.require(:project_feature_flag)
+          .permit(:name, :description, :active)
+  end
+
+  def update_params
+    params.require(:project_feature_flag)
+          .permit(:description, :active)
+  end
+end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4562540f3b1698..4076b5c29f0cbe 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -284,7 +284,7 @@ def get_project_nav_tabs(project, current_user)
       nav_tabs << :pipelines
     end
 
-    if can?(current_user, :read_environment, project) || can?(current_user, :read_cluster, project)
+    if can?(current_user, :read_environment, project) || can?(current_user, :read_cluster, project) || can?(current_user, :read_feature_flags, project)
       nav_tabs << :operations
     end
 
@@ -304,6 +304,7 @@ def get_project_nav_tabs(project, current_user)
   def tab_ability_map
     {
       environments:     :read_environment,
+      feature_flags:    :read_feature_flags,
       milestones:       :read_milestone,
       snippets:         :read_project_snippet,
       settings:         :admin_project,
diff --git a/app/models/project_feature_flag_access_token.rb b/app/models/project_feature_flags_access_token.rb
similarity index 64%
rename from app/models/project_feature_flag_access_token.rb
rename to app/models/project_feature_flags_access_token.rb
index 986685e9ee1c1a..d31c5713c3122c 100644
--- a/app/models/project_feature_flag_access_token.rb
+++ b/app/models/project_feature_flags_access_token.rb
@@ -1,4 +1,4 @@
-class ProjectFeatureFlagAccessToken < ActiveRecord::Base
+class ProjectFeatureFlagsAccessToken < ActiveRecord::Base
   include TokenAuthenticatable
 
   belongs_to :project
@@ -7,4 +7,6 @@ class ProjectFeatureFlagAccessToken < ActiveRecord::Base
   validates :token, presence: true
 
   add_authentication_token_field :token
+
+  before_validation :ensure_token!
 end
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 7c1450c20cdb4f..eb7c40d1338a21 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -15,6 +15,7 @@ class ProjectPolicy < BasePolicy
     note
     pipeline
     pipeline_schedule
+    feature_flags
     build
     trigger
     environment
@@ -234,6 +235,7 @@ class ProjectPolicy < BasePolicy
     enable :update_container_image
     enable :create_environment
     enable :create_deployment
+    enable :read_feature_flags
   end
 
   rule { can?(:maintainer_access) }.policy do
@@ -258,6 +260,9 @@ class ProjectPolicy < BasePolicy
     enable :read_cluster
     enable :create_cluster
     enable :create_environment_terminal
+    enable :create_feature_flags
+    enable :update_feature_flags
+    enable :admin_feature_flags
   end
 
   rule { (mirror_available & can?(:admin_project)) | admin }.enable :admin_remote_mirror
@@ -306,6 +311,7 @@ class ProjectPolicy < BasePolicy
     prevent(*create_read_update_admin_destroy(:build))
     prevent(*create_read_update_admin_destroy(:pipeline_schedule))
     prevent(*create_read_update_admin_destroy(:environment))
+    prevent(*create_read_update_admin_destroy(:feature_flags))
     prevent(*create_read_update_admin_destroy(:cluster))
     prevent(*create_read_update_admin_destroy(:deployment))
   end
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 23095d2cb10ab8..9c712faa9b879f 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -195,16 +195,16 @@
                     = _('Charts')
 
       - if project_nav_tab? :operations
-        = nav_link(controller: [:environments, :clusters, :user, :gcp]) do
-          = link_to metrics_project_environments_path(@project), class: 'shortcuts-operations' do
+        = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags]) do
+          = link_to project_environments_path(@project), class: 'shortcuts-operations' do
             .nav-icon-container
               = sprite_icon('cloud-gear')
             %span.nav-item-name
               = _('Operations')
 
           %ul.sidebar-sub-level-items
-            = nav_link(controller: [:environments, :clusters, :user, :gcp], html_options: { class: "fly-out-top-item" } ) do
-              = link_to metrics_project_environments_path(@project) do
+            = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags], html_options: { class: "fly-out-top-item" } ) do
+              = link_to project_environments_path(@project) do
                 %strong.fly-out-top-item-name
                   =  _('Operations')
             %li.divider.fly-out-top-item
@@ -249,6 +249,12 @@
                         %span= _("Got it!")
                         = sprite_icon('thumb-up')
 
+            - if project_nav_tab? :feature_flags
+              = nav_link(controller: :feature_flags) do
+                = link_to project_feature_flags_path(@project), title: 'Feature Flags', class: 'shortcuts-feature-flags' do
+                  %span
+                    = _('Feature Flags')
+
       - if project_nav_tab? :container_registry
         = nav_link(controller: %w[projects/registry/repositories]) do
           = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry' do
diff --git a/app/views/projects/feature_flags/_form.html.haml b/app/views/projects/feature_flags/_form.html.haml
new file mode 100644
index 00000000000000..38f35a959858d3
--- /dev/null
+++ b/app/views/projects/feature_flags/_form.html.haml
@@ -0,0 +1,25 @@
+- if @feature_flag.errors.any?
+  #error_explanation
+    .alert.alert-danger
+      - @feature_flag.errors.full_messages.each do |msg|
+        %p= msg
+
+- unless @feature_flag.persisted?
+  .form-group.row
+    = f.label :name, class: 'col-form-label col-sm-2' do
+      Name
+    .col-sm-10
+      = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control', disabled: @feature_flag.persisted?
+
+.form-group.row
+  = f.label :active, class: 'col-form-label col-sm-2' do
+    Active
+  .col-sm-10
+    = f.check_box :active
+
+.form-group.row
+  = f.label :description, class: 'col-form-label col-sm-2' do
+    Description
+  .col-sm-10
+    = f.text_area :description, rows: 5, class: 'form-control'
+    %span.help-inline Write a description of your feature flag
diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
new file mode 100644
index 00000000000000..5ebc16589b1fa2
--- /dev/null
+++ b/app/views/projects/feature_flags/_list.html.haml
@@ -0,0 +1,17 @@
+.card
+  .card-header
+    Feature flags (#{@feature_flags.count})
+  %ul.content-list.pages-domain-list
+    - @feature_flags.each do |feature_flag|
+      %li.pages-domain-list-item.unstyled
+        = feature_flag.name
+
+        %div.controls.d-none.d-md-block
+          = link_to 'Edit', edit_project_feature_flag_path(@project, feature_flag), class: "btn btn-sm btn-grouped"
+          = link_to 'Remove', project_feature_flag_path(@project, feature_flag), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
+
+        %p
+          - if feature_flag.active?
+            %span.badge.badge-success Enabled
+          - else
+            %span.badge.badge-danger Disabled
\ No newline at end of file
diff --git a/app/views/projects/feature_flags/_use.html.haml b/app/views/projects/feature_flags/_use.html.haml
new file mode 100644
index 00000000000000..a77244747a7673
--- /dev/null
+++ b/app/views/projects/feature_flags/_use.html.haml
@@ -0,0 +1,23 @@
+.card.bg-info
+  .card-header
+    Configure feature flags
+  .card-body
+    %p
+      Learn how to enable feature flags for your application.
+
+    %ol
+      %li
+        = _("Install a compatible with client library")
+        = (_("(checkout the %{link} for information on how to install it).") % { link: "here" }).html_safe
+      %li
+        = _("Specify the following URL during for the library configuration setup:")
+        %code#coordinator_address= "#{root_url(only_path: false)}api/v4/unleash"
+      %li
+        = _("Use the following application name:")
+        %code#registration_token= @project.id
+      %li
+        = _("Use the following application name:")
+        %code#registration_token= @unleash_instanceid
+      %li
+        = _("You can also see all features online:")
+        %code#registration_token= "#{root_url(only_path: false)}api/v4/unleash/features?appname=#{@project.id}&instanceid=#{@unleash_instanceid}"
\ No newline at end of file
diff --git a/app/views/projects/feature_flags/edit.html.haml b/app/views/projects/feature_flags/edit.html.haml
new file mode 100644
index 00000000000000..10a7b0e505a68f
--- /dev/null
+++ b/app/views/projects/feature_flags/edit.html.haml
@@ -0,0 +1,11 @@
+- add_to_breadcrumbs "Feature Flags", project_feature_flags_path(@project)
+- breadcrumb_title @feature_flag.name
+- page_title @feature_flag.name
+%h3.page-title
+  = @feature_flag.name
+%hr.clearfix
+%div
+  = form_for [@project, @feature_flag], url: project_feature_flag_path(@project, @feature_flag), html: { class: 'fieldset-form' } do |f|
+    = render 'form', { f: f }
+    .form-actions
+      = f.submit 'Save Changes', class: "btn btn-save"
diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
new file mode 100644
index 00000000000000..20b5d680e01ff1
--- /dev/null
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -0,0 +1,16 @@
+- page_title 'Feature Flags'
+
+%h3.page-title.with-button
+  Feature Flags
+
+  - if can?(current_user, :create_feature_flags, @project)
+    = link_to new_project_feature_flag_path(@project), class: 'btn btn-new float-right', title: 'New Feature Flag' do
+      New Feature Flag
+
+%p.light
+  With GitLab Feature Flags
+
+%hr.clearfix
+
+= render 'use'
+= render 'list'
diff --git a/app/views/projects/feature_flags/new.html.haml b/app/views/projects/feature_flags/new.html.haml
new file mode 100644
index 00000000000000..dac8fc54231252
--- /dev/null
+++ b/app/views/projects/feature_flags/new.html.haml
@@ -0,0 +1,12 @@
+- add_to_breadcrumbs "Feature Flags", project_feature_flags_path(@project)
+- page_title 'New Feature Flags'
+%h3.page-title
+  New Feature Flags
+%hr.clearfix
+%div
+  = form_for [@project, @feature_flag], url: project_feature_flags_path(@project), html: { class: 'fieldset-form' } do |f|
+    = render 'form', { f: f }
+    .form-actions
+      = f.submit 'Create New Feature Flag', class: "btn btn-save"
+      .float-right
+        = link_to _('Cancel'), project_feature_flags_path(@project), class: 'btn btn-cancel'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index c0c1775f8d37d5..d858bf0dc66ffe 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -351,6 +351,8 @@
         namespace :ci do
           resource :lint, only: [:show, :create]
         end
+
+        resources :feature_flags
       end
 
       draw :legacy_builds
diff --git a/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 9fe3d8433e48a4..9ca2d3a25803d0 100644
--- a/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -19,7 +19,7 @@ def change
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :project_feature_flag_access_tokens do |t|
+    create_table :project_feature_flags_access_tokens do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
diff --git a/db/schema.rb b/db/schema.rb
index 3516fcf53c5d5a..846b212b114191 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2090,6 +2090,24 @@
 
   add_index "project_deploy_tokens", ["project_id", "deploy_token_id"], name: "index_project_deploy_tokens_on_project_id_and_deploy_token_id", unique: true, using: :btree
 
+  create_table "project_feature_flags", force: :cascade do |t|
+    t.integer "project_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.string "name", null: false
+    t.text "description"
+    t.boolean "active", null: false
+  end
+
+  add_index "project_feature_flags", ["project_id", "name"], name: "index_project_feature_flags_on_project_id_and_name", unique: true, using: :btree
+
+  create_table "project_feature_flags_access_tokens", force: :cascade do |t|
+    t.integer "project_id", null: false
+    t.string "token", null: false
+  end
+
+  add_index "project_feature_flags_access_tokens", ["project_id", "token"], name: "project_feature_flag_access_token", unique: true, using: :btree
+
   create_table "project_features", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "merge_requests_access_level"
@@ -3247,6 +3265,8 @@
   add_foreign_key "project_custom_attributes", "projects", on_delete: :cascade
   add_foreign_key "project_deploy_tokens", "deploy_tokens", on_delete: :cascade
   add_foreign_key "project_deploy_tokens", "projects", on_delete: :cascade
+  add_foreign_key "project_feature_flags", "projects", on_delete: :cascade
+  add_foreign_key "project_feature_flags_access_tokens", "projects", on_delete: :cascade
   add_foreign_key "project_features", "projects", name: "fk_18513d9b92", on_delete: :cascade
   add_foreign_key "project_group_links", "projects", name: "fk_daa8cee94c", on_delete: :cascade
   add_foreign_key "project_import_data", "projects", name: "fk_ffb9ee3a10", on_delete: :cascade
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d2835d8e926780..8d6b1225b8956d 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1515,31 +1515,17 @@ class ResourceLabelEvent < Grape::Entity
       end
       expose :label, using: Entities::LabelBasic
       expose :action
+    end
 
-    class UnleashIssue < Grape::Entity
+    class UnleashFeature < Grape::Entity
       expose :name
-      expose :title, as: :description
-      expose :enabled
-      expose :strategies
-
-      private
-
-      def name
-        "\##{object.iid}"
-      end
-
-      def enabled
-        true
-      end
-
-      def strategies
-        [{ name: 'default' }]
-      end
+      expose :description, unless: ->(feature) { feature.description.nil? }
+      expose :active, as: :enabled
     end
 
-    class UnleashFeatureResponse < Grape::Entity
+    class UnleashFeatures < Grape::Entity
       expose :version
-      expose :features, with: UnleashIssue
+      expose :project_feature_flags, as: :features, with: UnleashFeature
 
       private
 
diff --git a/lib/api/unleash.rb b/lib/api/unleash.rb
index 249dff336749bf..e4f9d00d3ffd88 100644
--- a/lib/api/unleash.rb
+++ b/lib/api/unleash.rb
@@ -2,23 +2,39 @@ module API
   class Unleash < Grape::API
     include PaginationParams
 
-    #before { authenticate! }
+    before do
+      unauthorized! unless access_token
+    end
+
+    get ':unleash/features' do
+      present @project, with: Entities::UnleashFeatures
+    end
+
+    post 'unleash/client/register' do
+      status :ok
+    end
 
-    params do
-      requires :id, type: String, desc: 'The ID of a project'
+    post 'unleash/client/metrics' do
+      status :ok
     end
-    resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
-      get ':id/unleash/features' do
-        issues = IssuesFinder.new(current_user, project_id: user_project.id, label_name: 'rollout')
-        present issues, with: Entities::UnleashFeatureResponse
+
+    private
+
+    helpers do
+      def project
+        @project ||= find_project(unleash_appname)
+      end
+
+      def access_token
+        @access_token ||= ProjectFeatureFlagsAccessToken.find_by(token: unleash_instanceid, project: project)
       end
 
-      post ':id/unleash/client/register' do
-        status :ok
+      def unleash_appname
+        params[:appname] || env[:HTTP_UNLEASH_APPNAME]
       end
 
-      post ':id/unleash/client/metrics' do
-        status :ok
+      def unleash_instanceid
+        params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
       end
     end
   end
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index f5c81bbc20044f..0f47381dc4c15d 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -72,12 +72,12 @@ def environment_slug_regex_message
     end
 
     def feature_flag_regex
-      /\A[a-z]([-a-z0-9]*[a-z0-9])?\z/
+      /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
     end
 
     def feature_flag_regex_message
       "can contain only lowercase letters, digits, '_' and '-'. " \
-      "Must start with a letter, and cannot end with '-'"
+      "Must start with a letter, and cannot end with '-' or '_'"
     end
 
     def build_trace_section_regex
-- 
GitLab


From c15bfd70afb4880f6fc97f1cf88cb6024855281d Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 17 Sep 2018 14:03:03 +0200
Subject: [PATCH 04/57] Use badge for feature flag count in list header

---
 app/views/projects/feature_flags/_list.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
index 5ebc16589b1fa2..1e01e668ac8a87 100644
--- a/app/views/projects/feature_flags/_list.html.haml
+++ b/app/views/projects/feature_flags/_list.html.haml
@@ -1,6 +1,8 @@
 .card
   .card-header
-    Feature flags (#{@feature_flags.count})
+    Feature flags
+    .badge.badge-pill
+      = @feature_flags.count
   %ul.content-list.pages-domain-list
     - @feature_flags.each do |feature_flag|
       %li.pages-domain-list-item.unstyled
-- 
GitLab


From 2ba2656dc336b20ff996e76759bb443c1da80bcc Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 17 Sep 2018 14:09:01 +0200
Subject: [PATCH 05/57] Show emtpy state if now feature flags exist

---
 .../projects/feature_flags/_list.html.haml    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
index 1e01e668ac8a87..29055fc85ed5c2 100644
--- a/app/views/projects/feature_flags/_list.html.haml
+++ b/app/views/projects/feature_flags/_list.html.haml
@@ -4,16 +4,21 @@
     .badge.badge-pill
       = @feature_flags.count
   %ul.content-list.pages-domain-list
-    - @feature_flags.each do |feature_flag|
-      %li.pages-domain-list-item.unstyled
-        = feature_flag.name
+    - if @feature_flags.empty?
+      %li
+        .nothing-here-block
+          = s_('FeatureFlags|No feature flags found.')
+    - else
+      - @feature_flags.each do |feature_flag|
+        %li.pages-domain-list-item.unstyled
+          = feature_flag.name
 
-        %div.controls.d-none.d-md-block
-          = link_to 'Edit', edit_project_feature_flag_path(@project, feature_flag), class: "btn btn-sm btn-grouped"
-          = link_to 'Remove', project_feature_flag_path(@project, feature_flag), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
+          %div.controls.d-none.d-md-block
+            = link_to 'Edit', edit_project_feature_flag_path(@project, feature_flag), class: "btn btn-sm btn-grouped"
+            = link_to 'Remove', project_feature_flag_path(@project, feature_flag), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
 
-        %p
-          - if feature_flag.active?
-            %span.badge.badge-success Enabled
-          - else
-            %span.badge.badge-danger Disabled
\ No newline at end of file
+          %p
+            - if feature_flag.active?
+              %span.badge.badge-success Enabled
+            - else
+              %span.badge.badge-danger Disabled
\ No newline at end of file
-- 
GitLab


From 8fa1d249fa8e23d49cfd8e7d5fa8fbc3cf38dedf Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 17 Sep 2018 14:15:14 +0200
Subject: [PATCH 06/57] Remove two-column layout from create and edit feature
 flag forms

---
 .../projects/feature_flags/_form.html.haml    | 42 ++++++++++---------
 .../projects/feature_flags/edit.html.haml     |  6 +--
 .../projects/feature_flags/new.html.haml      |  9 ++--
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/app/views/projects/feature_flags/_form.html.haml b/app/views/projects/feature_flags/_form.html.haml
index 38f35a959858d3..c817f51551b811 100644
--- a/app/views/projects/feature_flags/_form.html.haml
+++ b/app/views/projects/feature_flags/_form.html.haml
@@ -4,22 +4,26 @@
       - @feature_flag.errors.full_messages.each do |msg|
         %p= msg
 
-- unless @feature_flag.persisted?
-  .form-group.row
-    = f.label :name, class: 'col-form-label col-sm-2' do
-      Name
-    .col-sm-10
-      = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control', disabled: @feature_flag.persisted?
-
-.form-group.row
-  = f.label :active, class: 'col-form-label col-sm-2' do
-    Active
-  .col-sm-10
-    = f.check_box :active
-
-.form-group.row
-  = f.label :description, class: 'col-form-label col-sm-2' do
-    Description
-  .col-sm-10
-    = f.text_area :description, rows: 5, class: 'form-control'
-    %span.help-inline Write a description of your feature flag
+%fieldset
+  .row
+    .form-group.col-md-4
+      = f.label :name, class: 'label-light', for: 'feature_flag_name' do
+        = s_('FeatureFlags|Name')
+      = f.text_field :name, class: "form-control", id: "feature_flag_name"
+  .row
+    .form-group.col-md-4
+      = f.label :description, class: 'label-light', for: 'feature_flag_description' do
+        = s_('FeatureFlags|Description')
+      = f.text_area :description, class: "form-control", id: "feature_flag_description", rows: 4
+  .row
+    .form-group.col-md-1
+      = f.label :active, class: 'label-light', for: 'feature_flag_status' do
+        = s_('FeatureFlags|Status')
+      = f.check_box :active, class: "form-control", id: "feature_flag_status", rows: 4
+.form-actions
+  - if @feature_flag.persisted?
+    = f.submit 'Save changes', class: "btn btn-save"
+  - else
+    = f.submit 'Create feature flag', class: "btn btn-save"
+  .float-right
+    = link_to _('Cancel'), project_feature_flags_path(@project), class: 'btn btn-cancel'
diff --git a/app/views/projects/feature_flags/edit.html.haml b/app/views/projects/feature_flags/edit.html.haml
index 10a7b0e505a68f..166f59bb92010c 100644
--- a/app/views/projects/feature_flags/edit.html.haml
+++ b/app/views/projects/feature_flags/edit.html.haml
@@ -1,11 +1,9 @@
 - add_to_breadcrumbs "Feature Flags", project_feature_flags_path(@project)
 - breadcrumb_title @feature_flag.name
-- page_title @feature_flag.name
+- page_title s_('FeatureFlags|Edit Feature Flag')
 %h3.page-title
-  = @feature_flag.name
+  = s_('FeatureFlags|Edit %{feature_flag_name}') % { feature_flag_name: @feature_flag.name }
 %hr.clearfix
 %div
   = form_for [@project, @feature_flag], url: project_feature_flag_path(@project, @feature_flag), html: { class: 'fieldset-form' } do |f|
     = render 'form', { f: f }
-    .form-actions
-      = f.submit 'Save Changes', class: "btn btn-save"
diff --git a/app/views/projects/feature_flags/new.html.haml b/app/views/projects/feature_flags/new.html.haml
index dac8fc54231252..d75d8585c61a2f 100644
--- a/app/views/projects/feature_flags/new.html.haml
+++ b/app/views/projects/feature_flags/new.html.haml
@@ -1,12 +1,9 @@
 - add_to_breadcrumbs "Feature Flags", project_feature_flags_path(@project)
-- page_title 'New Feature Flags'
+- breadcrumb_title s_('FeatureFlags|New')
+- page_title s_('FeatureFlags|New Feature Flag')
 %h3.page-title
-  New Feature Flags
+  = s_('FeatureFlags|New Feature Flag')
 %hr.clearfix
 %div
   = form_for [@project, @feature_flag], url: project_feature_flags_path(@project), html: { class: 'fieldset-form' } do |f|
     = render 'form', { f: f }
-    .form-actions
-      = f.submit 'Create New Feature Flag', class: "btn btn-save"
-      .float-right
-        = link_to _('Cancel'), project_feature_flags_path(@project), class: 'btn btn-cancel'
-- 
GitLab


From 1160a4e39e5a59fdbb5271c3773348b90593456a Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 17 Sep 2018 15:27:46 +0200
Subject: [PATCH 07/57] Add modal for deleting feature flags

---
 .../_delete_feature_flag_modal.html.haml      | 21 +++++++++++++++++++
 .../projects/feature_flags/_list.html.haml    |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml

diff --git a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
new file mode 100644
index 00000000000000..7367e6795260d6
--- /dev/null
+++ b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
@@ -0,0 +1,21 @@
+.modal{ id: "delete-feature-flag-modal-#{feature_flag.id}",
+  tabindex: -1,
+  role: 'dialog' }
+  .modal-dialog{ role: 'document' }
+    .modal-content
+      .modal-header
+        %h5.modal-title
+          = s_('FeatureFlags|Delete feature flag?')
+        %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
+          %span{ "aria-hidden": true } &times;
+      .modal-body
+        %p
+          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?') % { feature_flag_name: feature_flag.name }
+      .modal-footer
+        %button{ type: 'button', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
+
+        = button_to 'Delete',
+          project_feature_flag_path(@project, feature_flag),
+          title: 'Delete',
+          method: :delete,
+          class: 'btn btn-remove'
diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
index 29055fc85ed5c2..c64e84042159a5 100644
--- a/app/views/projects/feature_flags/_list.html.haml
+++ b/app/views/projects/feature_flags/_list.html.haml
@@ -14,8 +14,10 @@
           = feature_flag.name
 
           %div.controls.d-none.d-md-block
+            = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
             = link_to 'Edit', edit_project_feature_flag_path(@project, feature_flag), class: "btn btn-sm btn-grouped"
-            = link_to 'Remove', project_feature_flag_path(@project, feature_flag), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
+            %button.btn.btn-remove.btn-sm.btn-grouped{ type: 'button', data: { toggle: 'modal', target: "#delete-feature-flag-modal-#{feature_flag.id}" } }
+              Remove
 
           %p
             - if feature_flag.active?
-- 
GitLab


From 8cf49158cf806e3281613acf071b317bf10b195f Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 18 Sep 2018 12:26:03 +0200
Subject: [PATCH 08/57] Use modal for feature flag configuration information

---
 .../_configure_feature_flags_modal.html.haml  | 56 +++++++++++++++++++
 .../projects/feature_flags/_use.html.haml     | 23 --------
 .../projects/feature_flags/index.html.haml    | 12 ++--
 3 files changed, 64 insertions(+), 27 deletions(-)
 create mode 100644 app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
 delete mode 100644 app/views/projects/feature_flags/_use.html.haml

diff --git a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
new file mode 100644
index 00000000000000..2dae91771e0b7f
--- /dev/null
+++ b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -0,0 +1,56 @@
+#configure-feature-flags-modal.modal{ tabindex: -1,
+  role: 'dialog' }
+  .modal-dialog{ role: 'document' }
+    .modal-content
+      .modal-header
+        %h5.modal-title
+          = s_('FeatureFlags|Configure feature flags')
+        %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
+          %span{ "aria-hidden": true } &times;
+      .modal-body
+        %p
+          = s_('FeatureFlags|Install a compatible client library and specify the API URL, application name, and instance ID during the configuration setup.')
+          = link_to s_('FeatureFlags|More information'), '#'
+
+        .form-group
+          = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-light'
+          .input-group
+            - unleash_api_url = "#{root_url(only_path: false)}api/v4/unleash"
+            = text_field_tag :api_url,
+              unleash_api_url,
+              readonly: true,
+              class: "form-control js-select-on-focus"
+            %span.input-group-append
+              = clipboard_button(target: '#api_url',
+                title: _("Copy URL to clipboard"),
+                placement: "left",
+                container: '#configure-feature-flags-modal',
+                class: "input-group-text btn btn-default")
+
+        .form-group
+          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-light'
+          .input-group
+            = text_field_tag :application_name,
+              @project.id,
+              readonly: true,
+              class: "form-control js-select-on-focus"
+            %span.input-group-append
+              = clipboard_button(target: '#application_name',
+                title: _("Copy name to clipboard"),
+                placement: "left",
+                container: '#configure-feature-flags-modal',
+                class: "input-group-text btn btn-default")
+
+        .form-group
+          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-light'
+          .input-group
+            = text_field_tag :instance_id,
+              @unleash_instanceid,
+              readonly: true,
+              class: "form-control js-select-on-focus"
+            %span.input-group-append
+              = clipboard_button(target: '#instance_id',
+                title: _("Copy ID to clipboard"),
+                placement: "left",
+                container: '#configure-feature-flags-modal',
+                class: "input-group-text btn btn-default")
diff --git a/app/views/projects/feature_flags/_use.html.haml b/app/views/projects/feature_flags/_use.html.haml
deleted file mode 100644
index a77244747a7673..00000000000000
--- a/app/views/projects/feature_flags/_use.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-.card.bg-info
-  .card-header
-    Configure feature flags
-  .card-body
-    %p
-      Learn how to enable feature flags for your application.
-
-    %ol
-      %li
-        = _("Install a compatible with client library")
-        = (_("(checkout the %{link} for information on how to install it).") % { link: "here" }).html_safe
-      %li
-        = _("Specify the following URL during for the library configuration setup:")
-        %code#coordinator_address= "#{root_url(only_path: false)}api/v4/unleash"
-      %li
-        = _("Use the following application name:")
-        %code#registration_token= @project.id
-      %li
-        = _("Use the following application name:")
-        %code#registration_token= @unleash_instanceid
-      %li
-        = _("You can also see all features online:")
-        %code#registration_token= "#{root_url(only_path: false)}api/v4/unleash/features?appname=#{@project.id}&instanceid=#{@unleash_instanceid}"
\ No newline at end of file
diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index 20b5d680e01ff1..778682b066ac18 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -3,14 +3,18 @@
 %h3.page-title.with-button
   Feature Flags
 
-  - if can?(current_user, :create_feature_flags, @project)
-    = link_to new_project_feature_flag_path(@project), class: 'btn btn-new float-right', title: 'New Feature Flag' do
-      New Feature Flag
+  .pull-right
+    %button.btn.btn-default{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }
+      = s_('FeatureFlags|Configure')
+
+    - if can?(current_user, :create_feature_flags, @project)
+      = link_to new_project_feature_flag_path(@project), class: 'btn btn-new' do
+        = s_('FeatureFlags|New Feature Flag')
 
 %p.light
   With GitLab Feature Flags
 
 %hr.clearfix
 
-= render 'use'
+= render 'configure_feature_flags_modal'
 = render 'list'
-- 
GitLab


From 8227cdeac9ae6d9bf1a56660c3a97743964f15e0 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 18 Sep 2018 12:49:23 +0200
Subject: [PATCH 09/57] Add label to feature flag status in form

---
 app/views/projects/feature_flags/_form.html.haml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/feature_flags/_form.html.haml b/app/views/projects/feature_flags/_form.html.haml
index c817f51551b811..6aafc782f5b307 100644
--- a/app/views/projects/feature_flags/_form.html.haml
+++ b/app/views/projects/feature_flags/_form.html.haml
@@ -17,9 +17,12 @@
       = f.text_area :description, class: "form-control", id: "feature_flag_description", rows: 4
   .row
     .form-group.col-md-1
-      = f.label :active, class: 'label-light', for: 'feature_flag_status' do
+      = f.label :active, class: 'label-light' do
         = s_('FeatureFlags|Status')
-      = f.check_box :active, class: "form-control", id: "feature_flag_status", rows: 4
+      .form-check
+        = f.check_box :active, id: 'feature_flag_status', class: 'form-check-input'
+        = f.label :active, for: 'feature_flag_status', class: 'form-check-label' do
+          = s_('FeatureFlags|Active')
 .form-actions
   - if @feature_flag.persisted?
     = f.submit 'Save changes', class: "btn btn-save"
-- 
GitLab


From f1bbb2d9e832bf3a27cb014e9a84b8a89e65f4cf Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 18 Sep 2018 13:34:05 +0200
Subject: [PATCH 10/57] Use icons for feature flag action buttons

---
 .../projects/feature_flags/_list.html.haml      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
index c64e84042159a5..bc91756d14fa64 100644
--- a/app/views/projects/feature_flags/_list.html.haml
+++ b/app/views/projects/feature_flags/_list.html.haml
@@ -13,11 +13,20 @@
         %li.pages-domain-list-item.unstyled
           = feature_flag.name
 
-          %div.controls.d-none.d-md-block
+          %div.controls.d-flex
             = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
-            = link_to 'Edit', edit_project_feature_flag_path(@project, feature_flag), class: "btn btn-sm btn-grouped"
-            %button.btn.btn-remove.btn-sm.btn-grouped{ type: 'button', data: { toggle: 'modal', target: "#delete-feature-flag-modal-#{feature_flag.id}" } }
-              Remove
+
+            = button_to edit_project_feature_flag_path(@project, feature_flag),
+              class: 'btn btn-default has-tooltip',
+              type: 'button',
+              title: _('Edit') do
+              = sprite_icon('pencil', size: 16)
+
+            %button.btn.btn-danger.has-tooltip.m-0.ml-2{ type: 'button',
+              data: { toggle: 'modal',
+                target: "#delete-feature-flag-modal-#{feature_flag.id}" },
+              title: _('Delete') }
+              = sprite_icon('remove', size: 16)
 
           %p
             - if feature_flag.active?
-- 
GitLab


From 55e4c7ca57bf40c49af5a344cf1cc645e9badc22 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 18 Sep 2018 14:06:05 +0200
Subject: [PATCH 11/57] Convert feature flag list to table

---
 .../projects/feature_flags/_list.html.haml    | 35 -------------------
 .../projects/feature_flags/_table.html.haml   | 33 +++++++++++++++++
 .../projects/feature_flags/index.html.haml    |  7 +---
 3 files changed, 34 insertions(+), 41 deletions(-)
 delete mode 100644 app/views/projects/feature_flags/_list.html.haml
 create mode 100644 app/views/projects/feature_flags/_table.html.haml

diff --git a/app/views/projects/feature_flags/_list.html.haml b/app/views/projects/feature_flags/_list.html.haml
deleted file mode 100644
index bc91756d14fa64..00000000000000
--- a/app/views/projects/feature_flags/_list.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-.card
-  .card-header
-    Feature flags
-    .badge.badge-pill
-      = @feature_flags.count
-  %ul.content-list.pages-domain-list
-    - if @feature_flags.empty?
-      %li
-        .nothing-here-block
-          = s_('FeatureFlags|No feature flags found.')
-    - else
-      - @feature_flags.each do |feature_flag|
-        %li.pages-domain-list-item.unstyled
-          = feature_flag.name
-
-          %div.controls.d-flex
-            = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
-
-            = button_to edit_project_feature_flag_path(@project, feature_flag),
-              class: 'btn btn-default has-tooltip',
-              type: 'button',
-              title: _('Edit') do
-              = sprite_icon('pencil', size: 16)
-
-            %button.btn.btn-danger.has-tooltip.m-0.ml-2{ type: 'button',
-              data: { toggle: 'modal',
-                target: "#delete-feature-flag-modal-#{feature_flag.id}" },
-              title: _('Delete') }
-              = sprite_icon('remove', size: 16)
-
-          %p
-            - if feature_flag.active?
-              %span.badge.badge-success Enabled
-            - else
-              %span.badge.badge-danger Disabled
\ No newline at end of file
diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
new file mode 100644
index 00000000000000..2a022fb4b645ac
--- /dev/null
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -0,0 +1,33 @@
+
+.table-holder.border-top
+  .gl-responsive-table-row.table-row-header{ role: 'row' }
+    .table-section.section-10{ role: 'columnheader' }= s_('FeatureFlags|Status')
+    .table-section.section-50{ role: 'columnheader' }= s_('FeatureFlags|Feature flag')
+  - if @feature_flags.empty?
+    .nothing-here-block
+      = s_('FeatureFlags|No feature flags found.')
+  - else
+    - @feature_flags.each do |feature_flag|
+      = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
+
+      .gl-responsive-table-row{ role: 'row' }
+        .table-section.section-10{ role: 'gridcell' }
+          = check_box_tag 'feature_flag_status', nil, feature_flag.active?, disabled: true
+
+        .table-section.section-50.d-flex.flex-column{ role: 'gridcell' }
+          .text-monospace= feature_flag.name
+          .text-secondary= feature_flag.description
+
+        .table-section.section-40.table-button-footer{ role: 'gridcell' }
+          .table-action-buttons
+            = link_to edit_project_feature_flag_path(@project, feature_flag),
+                class: 'btn btn-default has-tooltip',
+                type: 'button',
+                title: _('Edit') do
+              = sprite_icon('pencil', size: 16)
+
+            %button.btn.btn-danger.has-tooltip.ml-2{ type: 'button',
+                data: { toggle: 'modal',
+                  target: "#delete-feature-flag-modal-#{feature_flag.id}" },
+                title: _('Delete') }
+              = sprite_icon('remove', size: 16)
diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index 778682b066ac18..8b446064548001 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -11,10 +11,5 @@
       = link_to new_project_feature_flag_path(@project), class: 'btn btn-new' do
         = s_('FeatureFlags|New Feature Flag')
 
-%p.light
-  With GitLab Feature Flags
-
-%hr.clearfix
-
 = render 'configure_feature_flags_modal'
-= render 'list'
+= render 'table'
-- 
GitLab


From 58bf62bc97012d6ff1259a4a7668a32484452a13 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 18 Sep 2018 14:26:52 +0200
Subject: [PATCH 12/57] Restyle empty state for feature flags

---
 .../feature_flags/_empty_state.html.haml      | 11 +++++
 .../_new_feature_flag_button.html.haml        |  3 ++
 .../projects/feature_flags/_table.html.haml   | 45 +++++++++----------
 .../projects/feature_flags/index.html.haml    | 10 +++--
 4 files changed, 40 insertions(+), 29 deletions(-)
 create mode 100644 app/views/projects/feature_flags/_empty_state.html.haml
 create mode 100644 app/views/projects/feature_flags/_new_feature_flag_button.html.haml

diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/app/views/projects/feature_flags/_empty_state.html.haml
new file mode 100644
index 00000000000000..3cc8873abe2a86
--- /dev/null
+++ b/app/views/projects/feature_flags/_empty_state.html.haml
@@ -0,0 +1,11 @@
+.border-top
+  .row.empty-state
+  .col-12
+    .text-content
+      %h4.text-center= s_('FeatureFlags|Get started with feature flags')
+      %p.text-center
+        = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
+        = link_to 'More information', '#'
+
+      .text-center
+        = render 'new_feature_flag_button'
diff --git a/app/views/projects/feature_flags/_new_feature_flag_button.html.haml b/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
new file mode 100644
index 00000000000000..61bf64113d921c
--- /dev/null
+++ b/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
@@ -0,0 +1,3 @@
+- if can?(current_user, :create_feature_flags, @project)
+  = link_to new_project_feature_flag_path(@project), class: 'btn btn-new' do
+    = s_('FeatureFlags|New Feature Flag')
diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index 2a022fb4b645ac..0da02da0a1ae5d 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -1,33 +1,28 @@
-
 .table-holder.border-top
   .gl-responsive-table-row.table-row-header{ role: 'row' }
     .table-section.section-10{ role: 'columnheader' }= s_('FeatureFlags|Status')
     .table-section.section-50{ role: 'columnheader' }= s_('FeatureFlags|Feature flag')
-  - if @feature_flags.empty?
-    .nothing-here-block
-      = s_('FeatureFlags|No feature flags found.')
-  - else
-    - @feature_flags.each do |feature_flag|
-      = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
+  - @feature_flags.each do |feature_flag|
+    = render 'delete_feature_flag_modal', { feature_flag: feature_flag }
 
-      .gl-responsive-table-row{ role: 'row' }
-        .table-section.section-10{ role: 'gridcell' }
-          = check_box_tag 'feature_flag_status', nil, feature_flag.active?, disabled: true
+    .gl-responsive-table-row{ role: 'row' }
+      .table-section.section-10{ role: 'gridcell' }
+        = check_box_tag 'feature_flag_status', nil, feature_flag.active?, disabled: true
 
-        .table-section.section-50.d-flex.flex-column{ role: 'gridcell' }
-          .text-monospace= feature_flag.name
-          .text-secondary= feature_flag.description
+      .table-section.section-50.d-flex.flex-column{ role: 'gridcell' }
+        .text-monospace= feature_flag.name
+        .text-secondary= feature_flag.description
 
-        .table-section.section-40.table-button-footer{ role: 'gridcell' }
-          .table-action-buttons
-            = link_to edit_project_feature_flag_path(@project, feature_flag),
-                class: 'btn btn-default has-tooltip',
-                type: 'button',
-                title: _('Edit') do
-              = sprite_icon('pencil', size: 16)
+      .table-section.section-40.table-button-footer{ role: 'gridcell' }
+        .table-action-buttons
+          = link_to edit_project_feature_flag_path(@project, feature_flag),
+              class: 'btn btn-default has-tooltip',
+              type: 'button',
+              title: _('Edit') do
+            = sprite_icon('pencil', size: 16)
 
-            %button.btn.btn-danger.has-tooltip.ml-2{ type: 'button',
-                data: { toggle: 'modal',
-                  target: "#delete-feature-flag-modal-#{feature_flag.id}" },
-                title: _('Delete') }
-              = sprite_icon('remove', size: 16)
+          %button.btn.btn-danger.has-tooltip.ml-2{ type: 'button',
+              data: { toggle: 'modal',
+                target: "#delete-feature-flag-modal-#{feature_flag.id}" },
+              title: _('Delete') }
+            = sprite_icon('remove', size: 16)
diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index 8b446064548001..f04291952d0149 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -7,9 +7,11 @@
     %button.btn.btn-default{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }
       = s_('FeatureFlags|Configure')
 
-    - if can?(current_user, :create_feature_flags, @project)
-      = link_to new_project_feature_flag_path(@project), class: 'btn btn-new' do
-        = s_('FeatureFlags|New Feature Flag')
+    = render 'new_feature_flag_button'
 
 = render 'configure_feature_flags_modal'
-= render 'table'
+
+- if @feature_flags.empty?
+  = render 'empty_state'
+- else
+  = render 'table'
-- 
GitLab


From af4a2fb819814bf55a3d3f62e17379f8328f4cb4 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 19 Sep 2018 15:00:58 +0200
Subject: [PATCH 13/57] Change margin of configure button to 8px

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

diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index f04291952d0149..0f13c2b0be17d5 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -4,7 +4,7 @@
   Feature Flags
 
   .pull-right
-    %button.btn.btn-default{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }
+    %button.btn.btn-default.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
       = s_('FeatureFlags|Configure')
 
     = render 'new_feature_flag_button'
-- 
GitLab


From 71678a43b89bc77372f7b8c6f395f64277edaccc Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 19 Sep 2018 15:02:01 +0200
Subject: [PATCH 14/57] Make feature flag table actions a button group

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

diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index 0da02da0a1ae5d..8dd2e7dced1562 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -14,14 +14,14 @@
         .text-secondary= feature_flag.description
 
       .table-section.section-40.table-button-footer{ role: 'gridcell' }
-        .table-action-buttons
+        .table-action-buttons.btn-group
           = link_to edit_project_feature_flag_path(@project, feature_flag),
               class: 'btn btn-default has-tooltip',
               type: 'button',
               title: _('Edit') do
             = sprite_icon('pencil', size: 16)
 
-          %button.btn.btn-danger.has-tooltip.ml-2{ type: 'button',
+          %button.btn.btn-danger.has-tooltip{ type: 'button',
               data: { toggle: 'modal',
                 target: "#delete-feature-flag-modal-#{feature_flag.id}" },
               title: _('Delete') }
-- 
GitLab


From afbd72938f307792170895690765353362055766 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 19 Sep 2018 15:08:20 +0200
Subject: [PATCH 15/57] Make configure button blue

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

diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index 0f13c2b0be17d5..72ab7e9a0cfa6e 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -4,7 +4,7 @@
   Feature Flags
 
   .pull-right
-    %button.btn.btn-default.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
+    %button.btn.btn-primary.btn-inverted.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
       = s_('FeatureFlags|Configure')
 
     = render 'new_feature_flag_button'
-- 
GitLab


From def89c5ed20ddfca2a11a2334f2284981e27b60e Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 19 Sep 2018 15:13:02 +0200
Subject: [PATCH 16/57] Replace checkbox for status in feature flag list with
 badge

---
 app/views/projects/feature_flags/_table.html.haml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index 8dd2e7dced1562..21efebb4b1acf2 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -7,7 +7,12 @@
 
     .gl-responsive-table-row{ role: 'row' }
       .table-section.section-10{ role: 'gridcell' }
-        = check_box_tag 'feature_flag_status', nil, feature_flag.active?, disabled: true
+        - if feature_flag.active?
+          %span.badge.badge-success
+            = s_('FeatureFlags|Active')
+        - else
+          %span.badge.badge-danger
+            = s_('FeatureFlags|Inactive')
 
       .table-section.section-50.d-flex.flex-column{ role: 'gridcell' }
         .text-monospace= feature_flag.name
-- 
GitLab


From 685b68a02e5425cbec2f84dc3398ba99b632f538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 19 Sep 2018 15:37:26 +0200
Subject: [PATCH 17/57] Add `destroy` action

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

diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 60d0c4668a6c09..3c6157c33e774d 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -39,6 +39,14 @@ def update
     end
   end
 
+  def destroy
+    if feature_flag.destroy
+      flash[:notice] = 'Feature flag was successfully removed.'
+    end
+
+    redirect_to project_feature_flags_path(@project)
+  end
+
   protected
 
   def feature_flag
-- 
GitLab


From 542763ffb02dff56e2911bd6d52b45fcf715863a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 20 Sep 2018 13:05:37 +0200
Subject: [PATCH 18/57] Rename FF schema to use `Operations::`

---
 .../feature_flag.rb}                          |  0
 .../feature_flag_access_token.rb}             |  0
 ...626171125_add_feature_flags_to_projects.rb |  4 +-
 db/schema.rb                                  | 40 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)
 rename app/models/{project_feature_flag.rb => operations/feature_flag.rb} (100%)
 rename app/models/{project_feature_flags_access_token.rb => operations/feature_flag_access_token.rb} (100%)

diff --git a/app/models/project_feature_flag.rb b/app/models/operations/feature_flag.rb
similarity index 100%
rename from app/models/project_feature_flag.rb
rename to app/models/operations/feature_flag.rb
diff --git a/app/models/project_feature_flags_access_token.rb b/app/models/operations/feature_flag_access_token.rb
similarity index 100%
rename from app/models/project_feature_flags_access_token.rb
rename to app/models/operations/feature_flag_access_token.rb
diff --git a/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 9ca2d3a25803d0..d3232463f61c99 100644
--- a/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -5,7 +5,7 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   DOWNTIME = false
 
   def change
-    create_table :project_feature_flags do |t|
+    create_table :operations_feature_flags do |t|
       t.integer :project_id, null: false
       t.datetime_with_timezone :created_at, null: false
       t.datetime_with_timezone :updated_at, null: false
@@ -19,7 +19,7 @@ def change
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :project_feature_flags_access_tokens do |t|
+    create_table :operations_feature_flags_access_tokens do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
diff --git a/db/schema.rb b/db/schema.rb
index 846b212b114191..975da6fcae95d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1943,6 +1943,24 @@
     t.string "nonce", null: false
   end
 
+  create_table "operations_feature_flags", force: :cascade do |t|
+    t.integer "project_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.string "name", null: false
+    t.text "description"
+    t.boolean "active", null: false
+  end
+
+  add_index "operations_feature_flags", ["project_id", "name"], name: "index_operations_feature_flags_on_project_id_and_name", unique: true, using: :btree
+
+  create_table "operations_feature_flags_access_tokens", force: :cascade do |t|
+    t.integer "project_id", null: false
+    t.string "token", null: false
+  end
+
+  add_index "operations_feature_flags_access_tokens", ["project_id", "token"], name: "project_feature_flag_access_token", unique: true, using: :btree
+
   create_table "packages_maven_metadata", id: :bigserial, force: :cascade do |t|
     t.integer "package_id", limit: 8, null: false
     t.datetime_with_timezone "created_at", null: false
@@ -2090,24 +2108,6 @@
 
   add_index "project_deploy_tokens", ["project_id", "deploy_token_id"], name: "index_project_deploy_tokens_on_project_id_and_deploy_token_id", unique: true, using: :btree
 
-  create_table "project_feature_flags", force: :cascade do |t|
-    t.integer "project_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
-    t.string "name", null: false
-    t.text "description"
-    t.boolean "active", null: false
-  end
-
-  add_index "project_feature_flags", ["project_id", "name"], name: "index_project_feature_flags_on_project_id_and_name", unique: true, using: :btree
-
-  create_table "project_feature_flags_access_tokens", force: :cascade do |t|
-    t.integer "project_id", null: false
-    t.string "token", null: false
-  end
-
-  add_index "project_feature_flags_access_tokens", ["project_id", "token"], name: "project_feature_flag_access_token", unique: true, using: :btree
-
   create_table "project_features", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "merge_requests_access_level"
@@ -3251,6 +3251,8 @@
   add_foreign_key "notes", "projects", name: "fk_99e097b079", on_delete: :cascade
   add_foreign_key "notification_settings", "users", name: "fk_0c95e91db7", on_delete: :cascade
   add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_oauth_openid_requests_oauth_access_grants_access_grant_id"
+  add_foreign_key "operations_feature_flags", "projects", on_delete: :cascade
+  add_foreign_key "operations_feature_flags_access_tokens", "projects", on_delete: :cascade
   add_foreign_key "packages_maven_metadata", "packages_packages", column: "package_id", name: "fk_be88aed360", on_delete: :cascade
   add_foreign_key "packages_package_files", "packages_packages", column: "package_id", name: "fk_86f0f182f8", on_delete: :cascade
   add_foreign_key "packages_packages", "projects", on_delete: :cascade
@@ -3265,8 +3267,6 @@
   add_foreign_key "project_custom_attributes", "projects", on_delete: :cascade
   add_foreign_key "project_deploy_tokens", "deploy_tokens", on_delete: :cascade
   add_foreign_key "project_deploy_tokens", "projects", on_delete: :cascade
-  add_foreign_key "project_feature_flags", "projects", on_delete: :cascade
-  add_foreign_key "project_feature_flags_access_tokens", "projects", on_delete: :cascade
   add_foreign_key "project_features", "projects", name: "fk_18513d9b92", on_delete: :cascade
   add_foreign_key "project_group_links", "projects", name: "fk_daa8cee94c", on_delete: :cascade
   add_foreign_key "project_import_data", "projects", name: "fk_ffb9ee3a10", on_delete: :cascade
-- 
GitLab


From d36a45047ea204da7724d7cac194dd2e95fc11a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 20 Sep 2018 13:16:32 +0200
Subject: [PATCH 19/57] Fix code structure

---
 .../projects/feature_flags_controller.rb      | 14 +++++------
 app/models/operations/feature_flag.rb         | 24 +++++++++++--------
 .../operations/feature_flag_access_token.rb   | 12 ----------
 .../operations/feature_flags_access_token.rb  | 16 +++++++++++++
 app/models/project.rb                         |  8 +++++--
 lib/api/entities.rb                           |  2 +-
 6 files changed, 44 insertions(+), 32 deletions(-)
 delete mode 100644 app/models/operations/feature_flag_access_token.rb
 create mode 100644 app/models/operations/feature_flags_access_token.rb

diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 3c6157c33e774d..19e1751db168f4 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -8,16 +8,16 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
   before_action :feature_flag, only: [:edit, :update, :destroy]
 
   def index
-    @feature_flags = project.project_feature_flags
-    @unleash_instanceid = project.project_feature_flags_access_tokens.first&.token || project.project_feature_flags_access_tokens.create!.token
+    @feature_flags = project.operations_feature_flags
+    @unleash_instanceid = project.feature_flag_access_token
   end
 
   def new
-    @feature_flag = project.project_feature_flags.new
+    @feature_flag = project.operations_feature_flags.new
   end
 
   def create
-    @feature_flag = project.project_feature_flags.create(create_params)
+    @feature_flag = project.operations_feature_flags.create(create_params)
 
     if @feature_flag.persisted?
       flash[:notice] = 'Feature flag was successfully created.'
@@ -50,16 +50,16 @@ def destroy
   protected
 
   def feature_flag
-    @feature_flag ||= project.project_feature_flags.find(params[:id])
+    @feature_flag ||= project.operations_feature_flags.find(params[:id])
   end
 
   def create_params
-    params.require(:project_feature_flag)
+    params.require(:operations_feature_flag)
           .permit(:name, :description, :active)
   end
 
   def update_params
-    params.require(:project_feature_flag)
+    params.require(:operations_feature_flag)
           .permit(:description, :active)
   end
 end
diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb
index 11681f555de3f4..4ae91fa5890bc9 100644
--- a/app/models/operations/feature_flag.rb
+++ b/app/models/operations/feature_flag.rb
@@ -1,12 +1,16 @@
-class ProjectFeatureFlag < ActiveRecord::Base
-  belongs_to :project
+module Operations
+  class FeatureFlag < ActiveRecord::Base
+    self.table_name = 'operations_feature_flags'
 
-  validates :project, presence: true
-  validates :name,
-    presence: true,
-    length: 2..63,
-    format: {
-      with: Gitlab::Regex.feature_flag_regex,
-      message: Gitlab::Regex.feature_flag_regex_message
-    }
+    belongs_to :project
+
+    validates :project, presence: true
+    validates :name,
+      presence: true,
+      length: 2..63,
+      format: {
+        with: Gitlab::Regex.feature_flag_regex,
+        message: Gitlab::Regex.feature_flag_regex_message
+      }
+  end
 end
diff --git a/app/models/operations/feature_flag_access_token.rb b/app/models/operations/feature_flag_access_token.rb
deleted file mode 100644
index d31c5713c3122c..00000000000000
--- a/app/models/operations/feature_flag_access_token.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class ProjectFeatureFlagsAccessToken < ActiveRecord::Base
-  include TokenAuthenticatable
-
-  belongs_to :project
-
-  validates :project, presence: true
-  validates :token, presence: true
-
-  add_authentication_token_field :token
-
-  before_validation :ensure_token!
-end
diff --git a/app/models/operations/feature_flags_access_token.rb b/app/models/operations/feature_flags_access_token.rb
new file mode 100644
index 00000000000000..3f2daf332f4206
--- /dev/null
+++ b/app/models/operations/feature_flags_access_token.rb
@@ -0,0 +1,16 @@
+module Operations
+  class FeatureFlagsAccessToken < ActiveRecord::Base
+    include TokenAuthenticatable
+
+    self.table_name = 'operations_feature_flags_access_tokens'
+
+    belongs_to :project
+
+    validates :project, presence: true
+    validates :token, presence: true
+
+    add_authentication_token_field :token
+
+    before_validation :ensure_token!
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 9e5b6cbc226c50..2d294fc0c5ee50 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -266,8 +266,8 @@ class Project < ActiveRecord::Base
   has_many :project_deploy_tokens
   has_many :deploy_tokens, through: :project_deploy_tokens
 
-  has_many :project_feature_flags
-  has_many :project_feature_flags_access_tokens
+  has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
+  has_one :operations_feature_flags_access_token, class_name: 'Operations::FeatureFlagsAccessToken'
 
   has_one :auto_devops, class_name: 'ProjectAutoDevops'
   has_many :custom_attributes, class_name: 'ProjectCustomAttribute'
@@ -2105,6 +2105,10 @@ def auto_cancel_pending_pipelines?
     auto_cancel_pending_pipelines == 'enabled'
   end
 
+  def feature_flag_access_token
+    (operations_feature_flags_access_token || create_operations_feature_flags_access_token!).token
+  end
+
   private
 
   # rubocop: disable CodeReuse/ServiceClass
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 8d6b1225b8956d..157a67737314ef 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1525,7 +1525,7 @@ class UnleashFeature < Grape::Entity
 
     class UnleashFeatures < Grape::Entity
       expose :version
-      expose :project_feature_flags, as: :features, with: UnleashFeature
+      expose :operations_feature_flags, as: :features, with: UnleashFeature
 
       private
 
-- 
GitLab


From 7827d187e47555e2014aba6a9d1a3dfc4d8e8285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 20 Sep 2018 13:30:14 +0200
Subject: [PATCH 20/57] Refactor API interface

---
 .../projects/feature_flags_controller.rb      |  1 -
 app/helpers/feature_flags_helper.rb           | 11 ++++
 .../_configure_feature_flags_modal.html.haml  | 23 ++++-----
 lib/api/api.rb                                |  2 +-
 lib/api/feature_flags.rb                      | 50 +++++++++++++++++++
 lib/api/unleash.rb                            | 41 ---------------
 6 files changed, 73 insertions(+), 55 deletions(-)
 create mode 100644 app/helpers/feature_flags_helper.rb
 create mode 100644 lib/api/feature_flags.rb
 delete mode 100644 lib/api/unleash.rb

diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 19e1751db168f4..41389e47c4f159 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -9,7 +9,6 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
 
   def index
     @feature_flags = project.operations_feature_flags
-    @unleash_instanceid = project.feature_flag_access_token
   end
 
   def new
diff --git a/app/helpers/feature_flags_helper.rb b/app/helpers/feature_flags_helper.rb
new file mode 100644
index 00000000000000..7986b4144dac0d
--- /dev/null
+++ b/app/helpers/feature_flags_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module FeatureFlagsHelper
+  def unleash_api_url(project)
+    "#{root_url(only_path: false)}api/v4/feature_flags/projects/#{project.id}/unleash"
+  end
+
+  def unleash_api_instanceid(project)
+    project.feature_flag_access_token
+  end
+end
diff --git a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index 2dae91771e0b7f..81816dd637fdb2 100644
--- a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -15,9 +15,8 @@
         .form-group
           = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-light'
           .input-group
-            - unleash_api_url = "#{root_url(only_path: false)}api/v4/unleash"
             = text_field_tag :api_url,
-              unleash_api_url,
+              unleash_api_url(@project),
               readonly: true,
               class: "form-control js-select-on-focus"
             %span.input-group-append
@@ -28,29 +27,29 @@
                 class: "input-group-text btn btn-default")
 
         .form-group
-          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-light'
+          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-light'
           .input-group
-            = text_field_tag :application_name,
-              @project.id,
+            = text_field_tag :instance_id,
+              unleash_api_instanceid(@project),
               readonly: true,
               class: "form-control js-select-on-focus"
             %span.input-group-append
-              = clipboard_button(target: '#application_name',
-                title: _("Copy name to clipboard"),
+              = clipboard_button(target: '#instance_id',
+                title: _("Copy ID to clipboard"),
                 placement: "left",
                 container: '#configure-feature-flags-modal',
                 class: "input-group-text btn btn-default")
 
         .form-group
-          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-light'
+          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-light'
           .input-group
-            = text_field_tag :instance_id,
-              @unleash_instanceid,
+            = text_field_tag :application_name,
+              "production",
               readonly: true,
               class: "form-control js-select-on-focus"
             %span.input-group-append
-              = clipboard_button(target: '#instance_id',
-                title: _("Copy ID to clipboard"),
+              = clipboard_button(target: '#application_name',
+                title: _("Copy name to clipboard"),
                 placement: "left",
                 container: '#configure-feature-flags-modal',
                 class: "input-group-text btn btn-default")
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 5ce0733b38b134..37d2f91ee93f7e 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -108,6 +108,7 @@ class API < Grape::API
     mount ::API::Environments
     mount ::API::Events
     mount ::API::Features
+    mount ::API::FeatureFlags
     mount ::API::Files
     mount ::API::GroupBoards
     mount ::API::GroupMilestones
@@ -158,7 +159,6 @@ class API < Grape::API
     mount ::API::Templates
     mount ::API::Todos
     mount ::API::Triggers
-    mount ::API::Unleash
     mount ::API::Users
     mount ::API::Variables
     mount ::API::Version
diff --git a/lib/api/feature_flags.rb b/lib/api/feature_flags.rb
new file mode 100644
index 00000000000000..dff43544a75a07
--- /dev/null
+++ b/lib/api/feature_flags.rb
@@ -0,0 +1,50 @@
+module API
+  class FeatureFlags < Grape::API
+    include PaginationParams
+
+    resource :feature_flags do
+      resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
+        params do
+          requires :id, type: String, desc: 'The ID of a project'
+        end
+        route_param :id do
+          resource :unleash do
+            before do
+              authenticate_by_unleash_access_token!
+            end
+
+            get 'features' do
+              present project, with: Entities::UnleashFeatures
+            end
+
+            post 'client/register' do
+              # not supported yet
+              status :ok
+            end
+
+            post 'client/metrics' do
+              # not supported yet
+              status :ok
+            end
+          end
+        end
+      end
+
+      helpers do
+        def project
+          @project ||= find_project(params[:id])
+        end
+
+        def unleash_instanceid
+          params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
+        end
+
+        def authenticate_by_unleash_access_token!
+          unless Operations::FeatureFlagsAccessToken.find_by(token: unleash_instanceid, project: project)
+            unauthorized!
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/unleash.rb b/lib/api/unleash.rb
deleted file mode 100644
index e4f9d00d3ffd88..00000000000000
--- a/lib/api/unleash.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module API
-  class Unleash < Grape::API
-    include PaginationParams
-
-    before do
-      unauthorized! unless access_token
-    end
-
-    get ':unleash/features' do
-      present @project, with: Entities::UnleashFeatures
-    end
-
-    post 'unleash/client/register' do
-      status :ok
-    end
-
-    post 'unleash/client/metrics' do
-      status :ok
-    end
-
-    private
-
-    helpers do
-      def project
-        @project ||= find_project(unleash_appname)
-      end
-
-      def access_token
-        @access_token ||= ProjectFeatureFlagsAccessToken.find_by(token: unleash_instanceid, project: project)
-      end
-
-      def unleash_appname
-        params[:appname] || env[:HTTP_UNLEASH_APPNAME]
-      end
-
-      def unleash_instanceid
-        params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
-      end
-    end
-  end
-end
-- 
GitLab


From 90a0e58158402e6ec948c7ef5d49e817978b7733 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 11:01:26 +0200
Subject: [PATCH 21/57] Remove top button row from feature flag empty state

---
 .../_configure_feature_flags_button.html.haml  |  2 ++
 .../feature_flags/_empty_state.html.haml       |  5 ++++-
 .../_new_feature_flag_button.html.haml         |  2 +-
 .../projects/feature_flags/index.html.haml     | 18 ++++++++----------
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 app/views/projects/feature_flags/_configure_feature_flags_button.html.haml

diff --git a/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml b/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
new file mode 100644
index 00000000000000..b1336b02967423
--- /dev/null
+++ b/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
@@ -0,0 +1,2 @@
+%button.btn.btn-primary.btn-inverted.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
+  = s_('FeatureFlags|Configure')
diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/app/views/projects/feature_flags/_empty_state.html.haml
index 3cc8873abe2a86..9b8c83328cfbfa 100644
--- a/app/views/projects/feature_flags/_empty_state.html.haml
+++ b/app/views/projects/feature_flags/_empty_state.html.haml
@@ -7,5 +7,8 @@
         = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
         = link_to 'More information', '#'
 
-      .text-center
+      .text-center.append-bottom-8
         = render 'new_feature_flag_button'
+
+      .text-center
+        = render 'configure_feature_flags_button'
diff --git a/app/views/projects/feature_flags/_new_feature_flag_button.html.haml b/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
index 61bf64113d921c..c2901f41a6aa05 100644
--- a/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
+++ b/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
@@ -1,3 +1,3 @@
 - if can?(current_user, :create_feature_flags, @project)
-  = link_to new_project_feature_flag_path(@project), class: 'btn btn-new' do
+  = link_to new_project_feature_flag_path(@project), class: 'btn btn-success' do
     = s_('FeatureFlags|New Feature Flag')
diff --git a/app/views/projects/feature_flags/index.html.haml b/app/views/projects/feature_flags/index.html.haml
index 72ab7e9a0cfa6e..bcdc6ac57fa6cf 100644
--- a/app/views/projects/feature_flags/index.html.haml
+++ b/app/views/projects/feature_flags/index.html.haml
@@ -1,17 +1,15 @@
-- page_title 'Feature Flags'
-
-%h3.page-title.with-button
-  Feature Flags
-
-  .pull-right
-    %button.btn.btn-primary.btn-inverted.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
-      = s_('FeatureFlags|Configure')
-
-    = render 'new_feature_flag_button'
+- page_title _('Feature Flags')
 
 = render 'configure_feature_flags_modal'
 
 - if @feature_flags.empty?
   = render 'empty_state'
 - else
+  %h3.page-title.with-button
+    = _('Feature Flags')
+
+    .pull-right
+      = render 'configure_feature_flags_button'
+      = render 'new_feature_flag_button'
+
   = render 'table'
-- 
GitLab


From ac554371fe2aefde6133eac31f67a71406fd39ad Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 11:03:29 +0200
Subject: [PATCH 22/57] Replace deprecated CSS classes

---
 .../_configure_feature_flags_modal.html.haml           |  6 +++---
 app/views/projects/feature_flags/_form.html.haml       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index 81816dd637fdb2..c660a7ae42b9e5 100644
--- a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -13,7 +13,7 @@
           = link_to s_('FeatureFlags|More information'), '#'
 
         .form-group
-          = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-light'
+          = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-bold'
           .input-group
             = text_field_tag :api_url,
               unleash_api_url(@project),
@@ -27,7 +27,7 @@
                 class: "input-group-text btn btn-default")
 
         .form-group
-          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-light'
+          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-bold'
           .input-group
             = text_field_tag :instance_id,
               unleash_api_instanceid(@project),
@@ -41,7 +41,7 @@
                 class: "input-group-text btn btn-default")
 
         .form-group
-          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-light'
+          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-bold'
           .input-group
             = text_field_tag :application_name,
               "production",
diff --git a/app/views/projects/feature_flags/_form.html.haml b/app/views/projects/feature_flags/_form.html.haml
index 6aafc782f5b307..0fe5f93f80d33a 100644
--- a/app/views/projects/feature_flags/_form.html.haml
+++ b/app/views/projects/feature_flags/_form.html.haml
@@ -7,17 +7,17 @@
 %fieldset
   .row
     .form-group.col-md-4
-      = f.label :name, class: 'label-light', for: 'feature_flag_name' do
+      = f.label :name, class: 'label-bold', for: 'feature_flag_name' do
         = s_('FeatureFlags|Name')
       = f.text_field :name, class: "form-control", id: "feature_flag_name"
   .row
     .form-group.col-md-4
-      = f.label :description, class: 'label-light', for: 'feature_flag_description' do
+      = f.label :description, class: 'label-bold', for: 'feature_flag_description' do
         = s_('FeatureFlags|Description')
       = f.text_area :description, class: "form-control", id: "feature_flag_description", rows: 4
   .row
     .form-group.col-md-1
-      = f.label :active, class: 'label-light' do
+      = f.label :active, class: 'label-bold' do
         = s_('FeatureFlags|Status')
       .form-check
         = f.check_box :active, id: 'feature_flag_status', class: 'form-check-input'
@@ -25,8 +25,8 @@
           = s_('FeatureFlags|Active')
 .form-actions
   - if @feature_flag.persisted?
-    = f.submit 'Save changes', class: "btn btn-save"
+    = f.submit 'Save changes', class: "btn btn-success"
   - else
-    = f.submit 'Create feature flag', class: "btn btn-save"
+    = f.submit 'Create feature flag', class: "btn btn-success"
   .float-right
     = link_to _('Cancel'), project_feature_flags_path(@project), class: 'btn btn-cancel'
-- 
GitLab


From eae3eb5c0a2f10ff340966109ae5fd0d95261386 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 11:36:27 +0200
Subject: [PATCH 23/57] Add graphic to feature flag empty state

---
 .../feature_flags/_empty_state.html.haml      | 24 +++++++++++--------
 yarn.lock                                     |  9 ++++---
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/app/views/projects/feature_flags/_empty_state.html.haml
index 9b8c83328cfbfa..6426bf481abbe9 100644
--- a/app/views/projects/feature_flags/_empty_state.html.haml
+++ b/app/views/projects/feature_flags/_empty_state.html.haml
@@ -1,14 +1,18 @@
 .border-top
   .row.empty-state
-  .col-12
-    .text-content
-      %h4.text-center= s_('FeatureFlags|Get started with feature flags')
-      %p.text-center
-        = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
-        = link_to 'More information', '#'
+    .col-12
+      .svg-content
+        = image_tag 'illustrations/feature_flag.svg'
 
-      .text-center.append-bottom-8
-        = render 'new_feature_flag_button'
+    .col-12
+      .text-content
+        %h4.text-center= s_('FeatureFlags|Get started with feature flags')
+        %p
+          = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
+          = link_to 'More information', '#'
 
-      .text-center
-        = render 'configure_feature_flags_button'
+        .text-center
+          = render 'new_feature_flag_button'
+
+        .text-center
+          = render 'configure_feature_flags_button'
diff --git a/yarn.lock b/yarn.lock
index 0b8bd6c81c2ad3..daf00af00610f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -180,17 +180,16 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.29.0":
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.29.0.tgz#03b65b513f9099bbda6ecf94d673a2952f8c6c70"
-  integrity sha512-sCl6nP3ph36+8P3nrw9VanAR648rgOUEBlEoLPHkhKm79xB1dUkXGBtI0uaSJVgbJx40M1/Ts8HSdMv+PF3EIg==
+"@gitlab-org/gitlab-svgs@^1.29.0":
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.30.0.tgz#72dca2fb67bafb3c975a322dc6406aaa29aed86c"
 
 "@gitlab-org/gitlab-ui@^1.7.1":
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.7.1.tgz#e9cce86cb7e34311405e705c1de674276b453f17"
   integrity sha512-X12W39lFnWmfmYcHBokrauKvp6VLW9u0rFdgBXWlnrRL2hBShnyeBsBXKLMGUGnofMtgYv3iYO/rFW9IB79lFg==
   dependencies:
-    "@gitlab-org/gitlab-svgs" "^1.23.0"
+    "@gitlab-org/gitlab-svgs" "^1.30.0"
     bootstrap-vue "^2.0.0-rc.11"
     vue "^2.5.16"
 
-- 
GitLab


From 11b79321fd29dd25a17516ad42d946f29e57de38 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 11:54:49 +0200
Subject: [PATCH 24/57] Add placeholder for feature flag documentation

---
 .../feature_flags/_configure_feature_flags_modal.html.haml  | 6 ++++--
 app/views/projects/feature_flags/_empty_state.html.haml     | 2 +-
 doc/user/project/operations/feature_flags.md                | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 doc/user/project/operations/feature_flags.md

diff --git a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index c660a7ae42b9e5..4968f898947114 100644
--- a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -9,8 +9,10 @@
           %span{ "aria-hidden": true } &times;
       .modal-body
         %p
-          = s_('FeatureFlags|Install a compatible client library and specify the API URL, application name, and instance ID during the configuration setup.')
-          = link_to s_('FeatureFlags|More information'), '#'
+          - client_libraries_url = help_page_path("user/project/operations/feature_flags", anchor: "client-libraries")
+          = s_('FeatureFlags|Install a %{docs_link_start}compatible client library%{docs_link_end} and specify the API URL, application name, and instance ID during the configuration setup.').html_safe % { docs_link_start: %Q{<a href="#{client_libraries_url}">}.html_safe,
+            docs_link_end: '</a>'.html_safe }
+          = link_to s_('FeatureFlags|More information'), help_page_path("user/project/operations/feature_flags")
 
         .form-group
           = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-bold'
diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/app/views/projects/feature_flags/_empty_state.html.haml
index 6426bf481abbe9..667abd5f0a7e24 100644
--- a/app/views/projects/feature_flags/_empty_state.html.haml
+++ b/app/views/projects/feature_flags/_empty_state.html.haml
@@ -9,7 +9,7 @@
         %h4.text-center= s_('FeatureFlags|Get started with feature flags')
         %p
           = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
-          = link_to 'More information', '#'
+          = link_to 'More information', help_page_path("user/project/operations/feature_flags")
 
         .text-center
           = render 'new_feature_flag_button'
diff --git a/doc/user/project/operations/feature_flags.md b/doc/user/project/operations/feature_flags.md
new file mode 100644
index 00000000000000..1dbf485fea8af6
--- /dev/null
+++ b/doc/user/project/operations/feature_flags.md
@@ -0,0 +1,3 @@
+# Feature Flags
+
+## Client libraries
-- 
GitLab


From 9494a3741a578d2d4c70fd5e590403953eaea5f2 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 12:36:05 +0200
Subject: [PATCH 25/57] Add feature flag name to delete modal header

---
 .../feature_flags/_delete_feature_flag_modal.html.haml      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
index 7367e6795260d6..091c20871f5769 100644
--- a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
+++ b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
@@ -1,3 +1,5 @@
+- feature_flag_name = capture do
+  %span.text-monospace= feature_flag.name
 .modal{ id: "delete-feature-flag-modal-#{feature_flag.id}",
   tabindex: -1,
   role: 'dialog' }
@@ -5,12 +7,12 @@
     .modal-content
       .modal-header
         %h5.modal-title
-          = s_('FeatureFlags|Delete feature flag?')
+          = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: feature_flag_name }
         %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
           %span{ "aria-hidden": true } &times;
       .modal-body
         %p
-          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?') % { feature_flag_name: feature_flag.name }
+          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?').html_safe % { feature_flag_name: feature_flag_name }
       .modal-footer
         %button{ type: 'button', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
 
-- 
GitLab


From 37ebe5d81b332d014443897f34a8fe043e9dd06f Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 12:42:28 +0200
Subject: [PATCH 26/57] Display column headers of feature flag table on small
 screen

---
 .../projects/feature_flags/_table.html.haml   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index 21efebb4b1acf2..78b1125ba80ef9 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -7,16 +7,20 @@
 
     .gl-responsive-table-row{ role: 'row' }
       .table-section.section-10{ role: 'gridcell' }
-        - if feature_flag.active?
-          %span.badge.badge-success
-            = s_('FeatureFlags|Active')
-        - else
-          %span.badge.badge-danger
-            = s_('FeatureFlags|Inactive')
+        .table-mobile-header{ role: "rowheader" }= s_('FeatureFlags|Status')
+        .table-mobile-content
+          - if feature_flag.active?
+            %span.badge.badge-success
+              = s_('FeatureFlags|Active')
+          - else
+            %span.badge.badge-danger
+              = s_('FeatureFlags|Inactive')
 
-      .table-section.section-50.d-flex.flex-column{ role: 'gridcell' }
-        .text-monospace= feature_flag.name
-        .text-secondary= feature_flag.description
+      .table-section.section-50{ role: 'gridcell' }
+        .table-mobile-header{ role: "rowheader" }= s_('FeatureFlags|Feature Flag')
+        .table-mobile-content.d-flex.flex-column
+          .text-monospace= feature_flag.name
+          .text-secondary= feature_flag.description
 
       .table-section.section-40.table-button-footer{ role: 'gridcell' }
         .table-action-buttons.btn-group
-- 
GitLab


From f3ac8e7d514c899422e04207bf86e83a99b9cec9 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 17:50:05 +0200
Subject: [PATCH 27/57] Put feature flags empty state buttons in same row

---
 app/views/projects/feature_flags/_empty_state.html.haml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/app/views/projects/feature_flags/_empty_state.html.haml
index 667abd5f0a7e24..ed8adf09cddba8 100644
--- a/app/views/projects/feature_flags/_empty_state.html.haml
+++ b/app/views/projects/feature_flags/_empty_state.html.haml
@@ -11,8 +11,5 @@
           = s_('FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.')
           = link_to 'More information', help_page_path("user/project/operations/feature_flags")
 
-        .text-center
-          = render 'new_feature_flag_button'
-
-        .text-center
-          = render 'configure_feature_flags_button'
+        = render 'new_feature_flag_button'
+        = render 'configure_feature_flags_button'
-- 
GitLab


From ec0d860cfa965423e86b60b5df1aef309cd76411 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 24 Sep 2018 19:08:20 +0200
Subject: [PATCH 28/57] Truncate long feature flag names and descriptions in
 table on small screens

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

diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index 78b1125ba80ef9..ca3420946d3c34 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -19,8 +19,8 @@
       .table-section.section-50{ role: 'gridcell' }
         .table-mobile-header{ role: "rowheader" }= s_('FeatureFlags|Feature Flag')
         .table-mobile-content.d-flex.flex-column
-          .text-monospace= feature_flag.name
-          .text-secondary= feature_flag.description
+          .text-monospace.text-truncate= feature_flag.name
+          .text-secondary.text-truncate= feature_flag.description
 
       .table-section.section-40.table-button-footer{ role: 'gridcell' }
         .table-action-buttons.btn-group
-- 
GitLab


From dca61d1d5238a41813f66df381eadcceec90024a Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 25 Sep 2018 11:11:29 +0200
Subject: [PATCH 29/57] Truncate feature flag name in delete modal header

---
 .../_delete_feature_flag_modal.html.haml             | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
index 091c20871f5769..02269049b606d4 100644
--- a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
+++ b/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
@@ -1,18 +1,20 @@
-- feature_flag_name = capture do
-  %span.text-monospace= feature_flag.name
 .modal{ id: "delete-feature-flag-modal-#{feature_flag.id}",
   tabindex: -1,
   role: 'dialog' }
   .modal-dialog{ role: 'document' }
     .modal-content
       .modal-header
-        %h5.modal-title
-          = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: feature_flag_name }
+        %h5.modal-title.d-flex.mw-100
+          - truncated_feature_flag_name = capture do
+            %span.text-truncate.prepend-left-4.append-right-4= feature_flag.name
+          = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: truncated_feature_flag_name }
         %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
           %span{ "aria-hidden": true } &times;
       .modal-body
         %p
-          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?').html_safe % { feature_flag_name: feature_flag_name }
+          - monospace_feature_flag_name = capture do
+            %span.text-monospace= feature_flag.name
+          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?').html_safe % { feature_flag_name: monospace_feature_flag_name }
       .modal-footer
         %button{ type: 'button', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
 
-- 
GitLab


From d59bafb90b517a548c0a1c4d0fa2935614b36077 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 25 Sep 2018 11:11:52 +0200
Subject: [PATCH 30/57] Avoid close icon leaving the modal header

---
 app/assets/stylesheets/framework/modal.scss | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index 7e30747963a592..b157f8c4568608 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -30,6 +30,17 @@
     }
   }
 
+  // leave enough space for the close icon
+  .modal-title {
+    &.mw-100,
+    &.w-100 {
+      // after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here
+      // https://github.com/twbs/bootstrap/pull/26976
+      margin-right: -2rem;
+      padding-right: 2rem;
+    }
+  }
+
   .page-title {
     margin-top: 0;
   }
-- 
GitLab


From 0f9274b2be31fc553081087d7e7c85c21465d159 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 26 Sep 2018 17:13:55 +0200
Subject: [PATCH 31/57] Limit feature flag description to 1000 characters

---
 app/models/operations/feature_flag.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb
index 4ae91fa5890bc9..b78bae6ca3cfaf 100644
--- a/app/models/operations/feature_flag.rb
+++ b/app/models/operations/feature_flag.rb
@@ -12,5 +12,6 @@ class FeatureFlag < ActiveRecord::Base
         with: Gitlab::Regex.feature_flag_regex,
         message: Gitlab::Regex.feature_flag_regex_message
       }
+    validates :description, length: 0..1000
   end
 end
-- 
GitLab


From 056d86db776ab7ce8f7d52783406af79a770591b Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 26 Sep 2018 17:15:09 +0200
Subject: [PATCH 32/57] Add feature tests for feature flags

---
 .../features/projects/feature_flags_spec.rb   | 187 ++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 ee/spec/features/projects/feature_flags_spec.rb

diff --git a/ee/spec/features/projects/feature_flags_spec.rb b/ee/spec/features/projects/feature_flags_spec.rb
new file mode 100644
index 00000000000000..ad66a4ecf8360a
--- /dev/null
+++ b/ee/spec/features/projects/feature_flags_spec.rb
@@ -0,0 +1,187 @@
+require 'spec_helper'
+
+describe 'Feature Flags', :js do
+  using RSpec::Parameterized::TableSyntax
+
+  invalid_input_table = proc do
+    'with space' | '' | 'Name can contain only'
+    '<script>' | '' | 'Name can contain only'
+    'x' * 100 | '' | 'Name is too long'
+    'some-name' | 'y' * 1001 | 'Description is too long'
+  end
+
+  let(:user) {create(:user)}
+  let(:project) {create(:project, namespace: user.namespace)}
+
+  before do
+    sign_in(user)
+  end
+
+  it 'shows empty state' do
+    visit(project_feature_flags_path(project))
+
+    expect_empty_state
+  end
+
+  context 'when creating a new feature flag' do
+    context 'and input is valid' do
+      where(:name, :description, :status) do
+        'my-active-flag' | 'a new flag' | true
+        'my-inactive-flag' | '' | false
+      end
+
+      with_them do
+        it 'adds the feature flag to the table' do
+          add_feature_flag(name, description, status)
+
+          expect_feature_flag(name, description, status)
+          expect(page).to have_selector '.flash-container', text: 'successfully created'
+        end
+      end
+    end
+
+    context 'and input is invalid' do
+      where(:name, :description, :error_message, &invalid_input_table)
+
+      with_them do
+        it 'displays an error message' do
+          add_feature_flag(name, description, false)
+
+          # TODO: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7433#note_104442383
+          # expect(current_path).to eq new_project_feature_flag_path(project)
+          expect(page).to have_selector '.alert-danger', text: error_message
+        end
+      end
+    end
+  end
+
+  context 'when editing a feature flag' do
+    before do
+      add_feature_flag('feature-flag-to-edit', 'with some description', false)
+    end
+
+    context 'and input is valid' do
+      it 'updates the feature flag' do
+        name = 'new-name'
+        description = 'new description'
+
+        edit_feature_flag('feature-flag-to-edit', name, description, true)
+
+        expect_feature_flag(name, description, true)
+        expect(page).to have_selector '.flash-container', text: 'successfully updated'
+      end
+    end
+
+    context 'and input is invalid' do
+      where(:name, :description, :error_message, &invalid_input_table)
+
+      with_them do
+        it 'displays an error message' do
+          edit_feature_flag('feature-flag-to-edit', name, description, false)
+
+          # TODO: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7433#note_104442383
+          # expect(current_path).to eq new_project_feature_flag_path(project)
+          expect(page).to have_selector '.alert-danger', text: error_message
+        end
+      end
+    end
+  end
+
+  context 'when deleting a feature flag' do
+    before do
+      add_feature_flag('feature-flag-to-delete', 'with some description', false)
+    end
+
+    context 'and no feature flags are left' do
+      it 'shows empty state' do
+        visit(project_feature_flags_path(project))
+
+        delete_feature_flag('feature-flag-to-delete')
+
+        expect_empty_state
+      end
+    end
+
+    context 'and there is a feature flag left' do
+      before do
+        add_feature_flag('another-feature-flag', '', true)
+      end
+
+      it 'shows feature flag table without deleted feature flag' do
+        visit(project_feature_flags_path(project))
+
+        delete_feature_flag('feature-flag-to-delete')
+
+        expect_feature_flag('another-feature-flag', '', true)
+      end
+    end
+
+    it 'does not delete if modal is cancelled' do
+      visit(project_feature_flags_path(project))
+
+      delete_feature_flag('feature-flag-to-delete', false)
+
+      expect_feature_flag('feature-flag-to-delete', 'with some description', false)
+    end
+  end
+
+  private
+
+  def add_feature_flag(name, description, status)
+    visit(new_project_feature_flag_path(project))
+
+    fill_in 'Name', with: name
+    fill_in 'Description', with: description
+
+    if status
+      check('Active')
+    else
+      uncheck('Active')
+    end
+
+    click_button 'Create feature flag'
+  end
+
+  def delete_feature_flag(name, confirm = true)
+    delete_button = find('.gl-responsive-table-row', text: name).find('.btn-danger[title="Delete"]')
+    delete_button.click
+
+    within '.modal' do
+      if confirm
+        click_button 'Delete'
+      else
+        click_button 'Cancel'
+      end
+    end
+  end
+
+  def edit_feature_flag(old_name, new_name, new_description, new_status)
+    visit(project_feature_flags_path(project))
+    edit_button = find('.gl-responsive-table-row', text: old_name).find('.btn-default[title="Edit"]')
+    edit_button.click
+
+    fill_in 'Name', with: new_name
+    fill_in 'Description', with: new_description
+
+    if new_status
+      check('Active')
+    else
+      uncheck('Active')
+    end
+
+    click_button 'Save changes'
+  end
+
+  def expect_empty_state
+    expect(page).to have_text 'Get started with feature flags'
+    expect(page).to have_selector('.btn-success', text: 'New Feature Flag')
+    expect(page).to have_selector('.btn-primary.btn-inverted', text: 'Configure')
+  end
+
+  def expect_feature_flag(name, description, status)
+    expect(current_path).to eq project_feature_flags_path(project)
+    expect(page).to have_selector '.table-section .badge', text: status ? 'Active' : 'Inactive'
+    expect(page).to have_selector '.table-section', text: name
+    expect(page).to have_selector '.table-section', text: description
+  end
+end
-- 
GitLab


From b7732d93b64d19b03e39fbf1ebd2bca5095cd81b Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 27 Sep 2018 10:09:00 +0200
Subject: [PATCH 33/57] Add missing translations for feature flags

---
 .../layouts/nav/sidebar/_project.html.haml    |  2 +-
 .../projects/feature_flags/_form.html.haml    |  4 +-
 locale/gitlab.pot                             | 81 +++++++++++++++++++
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 9c712faa9b879f..e1346ef857a906 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -251,7 +251,7 @@
 
             - if project_nav_tab? :feature_flags
               = nav_link(controller: :feature_flags) do
-                = link_to project_feature_flags_path(@project), title: 'Feature Flags', class: 'shortcuts-feature-flags' do
+                = link_to project_feature_flags_path(@project), title: _('Feature Flags'), class: 'shortcuts-feature-flags' do
                   %span
                     = _('Feature Flags')
 
diff --git a/app/views/projects/feature_flags/_form.html.haml b/app/views/projects/feature_flags/_form.html.haml
index 0fe5f93f80d33a..26a1b4a2f14b08 100644
--- a/app/views/projects/feature_flags/_form.html.haml
+++ b/app/views/projects/feature_flags/_form.html.haml
@@ -25,8 +25,8 @@
           = s_('FeatureFlags|Active')
 .form-actions
   - if @feature_flag.persisted?
-    = f.submit 'Save changes', class: "btn btn-success"
+    = f.submit s_('FeatureFlags|Save changes'), class: "btn btn-success"
   - else
-    = f.submit 'Create feature flag', class: "btn btn-success"
+    = f.submit s_('FeatureFlags|Create feature flag'), class: "btn btn-success"
   .float-right
     = link_to _('Cancel'), project_feature_flags_path(@project), class: 'btn btn-cancel'
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8c5cec93a1894f..80b0652bb895ff 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2233,6 +2233,9 @@ msgstr ""
 msgid "Copy HTTPS clone URL"
 msgstr ""
 
+msgid "Copy ID to clipboard"
+msgstr ""
+
 msgid "Copy SSH clone URL"
 msgstr ""
 
@@ -2257,6 +2260,9 @@ msgstr ""
 msgid "Copy incoming email address to clipboard"
 msgstr ""
 
+msgid "Copy name to clipboard"
+msgstr ""
+
 msgid "Copy reference to clipboard"
 msgstr ""
 
@@ -3174,6 +3180,81 @@ msgstr ""
 msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)"
 msgstr ""
 
+msgid "Feature Flags"
+msgstr ""
+
+msgid "FeatureFlags|API URL"
+msgstr ""
+
+msgid "FeatureFlags|Active"
+msgstr ""
+
+msgid "FeatureFlags|Application name"
+msgstr ""
+
+msgid "FeatureFlags|Configure"
+msgstr ""
+
+msgid "FeatureFlags|Configure feature flags"
+msgstr ""
+
+msgid "FeatureFlags|Create feature flag"
+msgstr ""
+
+msgid "FeatureFlags|Delete %{feature_flag_name}?"
+msgstr ""
+
+msgid "FeatureFlags|Description"
+msgstr ""
+
+msgid "FeatureFlags|Edit %{feature_flag_name}"
+msgstr ""
+
+msgid "FeatureFlags|Edit Feature Flag"
+msgstr ""
+
+msgid "FeatureFlags|Feature Flag"
+msgstr ""
+
+msgid "FeatureFlags|Feature flag"
+msgstr ""
+
+msgid "FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?"
+msgstr ""
+
+msgid "FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality."
+msgstr ""
+
+msgid "FeatureFlags|Get started with feature flags"
+msgstr ""
+
+msgid "FeatureFlags|Inactive"
+msgstr ""
+
+msgid "FeatureFlags|Install a %{docs_link_start}compatible client library%{docs_link_end} and specify the API URL, application name, and instance ID during the configuration setup."
+msgstr ""
+
+msgid "FeatureFlags|Instance ID"
+msgstr ""
+
+msgid "FeatureFlags|More information"
+msgstr ""
+
+msgid "FeatureFlags|Name"
+msgstr ""
+
+msgid "FeatureFlags|New"
+msgstr ""
+
+msgid "FeatureFlags|New Feature Flag"
+msgstr ""
+
+msgid "FeatureFlags|Save changes"
+msgstr ""
+
+msgid "FeatureFlags|Status"
+msgstr ""
+
 msgid "Feb"
 msgstr ""
 
-- 
GitLab


From d77cf4f08c5af6a7e2595e85f063d302f993a2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 27 Sep 2018 13:18:47 +0200
Subject: [PATCH 34/57] Fix after FE review

- Make name unique
- Make description to be as much as 255 characters longs
- Make the list paginated and ordered
---
 app/controllers/projects/feature_flags_controller.rb | 4 +++-
 app/models/operations/feature_flag.rb                | 3 ++-
 app/views/projects/feature_flags/_table.html.haml    | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/feature_flags_controller.rb b/app/controllers/projects/feature_flags_controller.rb
index 41389e47c4f159..a70d8fe3c3337f 100644
--- a/app/controllers/projects/feature_flags_controller.rb
+++ b/app/controllers/projects/feature_flags_controller.rb
@@ -9,6 +9,8 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
 
   def index
     @feature_flags = project.operations_feature_flags
+      .order(:name)
+      .page(params[:page]).per(30)
   end
 
   def new
@@ -59,6 +61,6 @@ def create_params
 
   def update_params
     params.require(:operations_feature_flag)
-          .permit(:description, :active)
+          .permit(:name, :description, :active)
   end
 end
diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb
index b78bae6ca3cfaf..f447f292f95724 100644
--- a/app/models/operations/feature_flag.rb
+++ b/app/models/operations/feature_flag.rb
@@ -12,6 +12,7 @@ class FeatureFlag < ActiveRecord::Base
         with: Gitlab::Regex.feature_flag_regex,
         message: Gitlab::Regex.feature_flag_regex_message
       }
-    validates :description, length: 0..1000
+    validates :name, uniqueness: { scope: :project_id }
+    validates :description, length: 0..255
   end
 end
diff --git a/app/views/projects/feature_flags/_table.html.haml b/app/views/projects/feature_flags/_table.html.haml
index ca3420946d3c34..9570725e6ebe0d 100644
--- a/app/views/projects/feature_flags/_table.html.haml
+++ b/app/views/projects/feature_flags/_table.html.haml
@@ -35,3 +35,5 @@
                 target: "#delete-feature-flag-modal-#{feature_flag.id}" },
               title: _('Delete') }
             = sprite_icon('remove', size: 16)
+
+= paginate @feature_flags, theme: "gitlab"
-- 
GitLab


From f8a140c8d1990d80d753b92930bec9f83ee85346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 1 Oct 2018 12:54:45 +0200
Subject: [PATCH 35/57] Move feature flags to ee/

---
 app/helpers/projects_helper.rb                |  3 +--
 app/models/project.rb                         |  7 -------
 app/policies/project_policy.rb                |  4 ----
 config/routes/project.rb                      |  2 ++
 .../projects/feature_flags_controller.rb      |  0
 ee/app/helpers/ee/projects_helper.rb          | 11 ++++++++++
 .../app}/helpers/feature_flags_helper.rb      |  0
 ee/app/models/ee/project.rb                   |  7 +++++++
 .../app}/models/operations/feature_flag.rb    |  0
 .../operations/feature_flags_access_token.rb  |  0
 ee/app/policies/ee/project_policy.rb          |  4 ++++
 .../_configure_feature_flags_button.html.haml |  0
 .../_configure_feature_flags_modal.html.haml  |  0
 .../_delete_feature_flag_modal.html.haml      |  0
 .../feature_flags/_empty_state.html.haml      |  0
 .../projects/feature_flags/_form.html.haml    |  0
 .../_new_feature_flag_button.html.haml        |  0
 .../projects/feature_flags/_table.html.haml   |  0
 .../projects/feature_flags/edit.html.haml     |  0
 .../projects/feature_flags/index.html.haml    |  0
 .../projects/feature_flags/new.html.haml      |  0
 ...626171125_add_feature_flags_to_projects.rb |  0
 .../feature_flags.rb => ee/lib/api/unleash.rb |  2 +-
 ee/lib/ee/api/entities.rb                     | 17 ++++++++++++++++
 ee/lib/ee/gitlab/regex.rb                     |  9 +++++++++
 lib/api/api.rb                                |  2 +-
 lib/api/entities.rb                           | 20 -------------------
 lib/gitlab/regex.rb                           |  9 ---------
 28 files changed, 53 insertions(+), 44 deletions(-)
 rename {app => ee/app}/controllers/projects/feature_flags_controller.rb (100%)
 rename {app => ee/app}/helpers/feature_flags_helper.rb (100%)
 rename {app => ee/app}/models/operations/feature_flag.rb (100%)
 rename {app => ee/app}/models/operations/feature_flags_access_token.rb (100%)
 rename {app => ee/app}/views/projects/feature_flags/_configure_feature_flags_button.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_configure_feature_flags_modal.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_delete_feature_flag_modal.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_empty_state.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_form.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_new_feature_flag_button.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/_table.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/edit.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/index.html.haml (100%)
 rename {app => ee/app}/views/projects/feature_flags/new.html.haml (100%)
 rename {db => ee/db}/migrate/20180626171125_add_feature_flags_to_projects.rb (100%)
 rename lib/api/feature_flags.rb => ee/lib/api/unleash.rb (97%)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4076b5c29f0cbe..4562540f3b1698 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -284,7 +284,7 @@ def get_project_nav_tabs(project, current_user)
       nav_tabs << :pipelines
     end
 
-    if can?(current_user, :read_environment, project) || can?(current_user, :read_cluster, project) || can?(current_user, :read_feature_flags, project)
+    if can?(current_user, :read_environment, project) || can?(current_user, :read_cluster, project)
       nav_tabs << :operations
     end
 
@@ -304,7 +304,6 @@ def get_project_nav_tabs(project, current_user)
   def tab_ability_map
     {
       environments:     :read_environment,
-      feature_flags:    :read_feature_flags,
       milestones:       :read_milestone,
       snippets:         :read_project_snippet,
       settings:         :admin_project,
diff --git a/app/models/project.rb b/app/models/project.rb
index 2d294fc0c5ee50..9eee28ad0f455d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -266,9 +266,6 @@ class Project < ActiveRecord::Base
   has_many :project_deploy_tokens
   has_many :deploy_tokens, through: :project_deploy_tokens
 
-  has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
-  has_one :operations_feature_flags_access_token, class_name: 'Operations::FeatureFlagsAccessToken'
-
   has_one :auto_devops, class_name: 'ProjectAutoDevops'
   has_many :custom_attributes, class_name: 'ProjectCustomAttribute'
 
@@ -2105,10 +2102,6 @@ def auto_cancel_pending_pipelines?
     auto_cancel_pending_pipelines == 'enabled'
   end
 
-  def feature_flag_access_token
-    (operations_feature_flags_access_token || create_operations_feature_flags_access_token!).token
-  end
-
   private
 
   # rubocop: disable CodeReuse/ServiceClass
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index eb7c40d1338a21..12c49efd5b9a13 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -235,7 +235,6 @@ class ProjectPolicy < BasePolicy
     enable :update_container_image
     enable :create_environment
     enable :create_deployment
-    enable :read_feature_flags
   end
 
   rule { can?(:maintainer_access) }.policy do
@@ -260,9 +259,6 @@ class ProjectPolicy < BasePolicy
     enable :read_cluster
     enable :create_cluster
     enable :create_environment_terminal
-    enable :create_feature_flags
-    enable :update_feature_flags
-    enable :admin_feature_flags
   end
 
   rule { (mirror_available & can?(:admin_project)) | admin }.enable :admin_remote_mirror
diff --git a/config/routes/project.rb b/config/routes/project.rb
index d858bf0dc66ffe..7eff9401e5c200 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -352,7 +352,9 @@
           resource :lint, only: [:show, :create]
         end
 
+        ## EE-specific
         resources :feature_flags
+        ## EE-specific
       end
 
       draw :legacy_builds
diff --git a/app/controllers/projects/feature_flags_controller.rb b/ee/app/controllers/projects/feature_flags_controller.rb
similarity index 100%
rename from app/controllers/projects/feature_flags_controller.rb
rename to ee/app/controllers/projects/feature_flags_controller.rb
diff --git a/ee/app/helpers/ee/projects_helper.rb b/ee/app/helpers/ee/projects_helper.rb
index 3986cd93ec1d4d..83503f3e3901b9 100644
--- a/ee/app/helpers/ee/projects_helper.rb
+++ b/ee/app/helpers/ee/projects_helper.rb
@@ -25,8 +25,19 @@ def get_project_nav_tabs(project, current_user)
         nav_tabs << :packages
       end
 
+      if can?(current_user, :read_feature_flags, project) && !nav_tabs.include?(:operations)
+        nav_tabs << :operations
+      end
+
       nav_tabs
     end
+    
+    override :tab_ability_map
+    def tab_ability_map
+      tab_ability_map = super
+      tab_ability_map[:feature_flags] = read_feature_flags
+      tab_ability_map
+    end
 
     override :project_permissions_settings
     def project_permissions_settings(project)
diff --git a/app/helpers/feature_flags_helper.rb b/ee/app/helpers/feature_flags_helper.rb
similarity index 100%
rename from app/helpers/feature_flags_helper.rb
rename to ee/app/helpers/feature_flags_helper.rb
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index 394cd732fbbfac..b185302ea762e1 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -50,6 +50,9 @@ module Project
       has_many :prometheus_alerts, inverse_of: :project
       has_many :prometheus_alert_events, inverse_of: :project
 
+      has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
+      has_one :operations_feature_flags_access_token, class_name: 'Operations::FeatureFlagsAccessToken'
+
       scope :with_shared_runners_limit_enabled, -> { with_shared_runners.non_public_only }
 
       scope :mirror, -> { where(mirror: true) }
@@ -559,6 +562,10 @@ def update_root_ref(remote_name)
       change_head(root_ref) if root_ref.present? && root_ref != default_branch
     end
 
+    def feature_flag_access_token
+      (operations_feature_flags_access_token || create_operations_feature_flags_access_token!).token
+    end
+
     private
 
     def set_override_pull_mirror_available
diff --git a/app/models/operations/feature_flag.rb b/ee/app/models/operations/feature_flag.rb
similarity index 100%
rename from app/models/operations/feature_flag.rb
rename to ee/app/models/operations/feature_flag.rb
diff --git a/app/models/operations/feature_flags_access_token.rb b/ee/app/models/operations/feature_flags_access_token.rb
similarity index 100%
rename from app/models/operations/feature_flags_access_token.rb
rename to ee/app/models/operations/feature_flags_access_token.rb
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 1a0040876332b4..515c2694068fc8 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -99,6 +99,9 @@ module ProjectPolicy
         enable :admin_board
         enable :admin_vulnerability_feedback
         enable :create_package
+        enable :read_feature_flags
+        enable :create_feature_flags
+        enable :update_feature_flags
       end
 
       rule { can?(:public_access) }.enable :read_package
@@ -122,6 +125,7 @@ module ProjectPolicy
         enable :admin_path_locks
         enable :update_approvers
         enable :destroy_package
+        enable :admin_feature_flags
       end
 
       rule { license_management_enabled & can?(:maintainer_access) }.enable :admin_software_license_policy
diff --git a/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
rename to ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
diff --git a/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
rename to ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
diff --git a/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
rename to ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
diff --git a/app/views/projects/feature_flags/_empty_state.html.haml b/ee/app/views/projects/feature_flags/_empty_state.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_empty_state.html.haml
rename to ee/app/views/projects/feature_flags/_empty_state.html.haml
diff --git a/app/views/projects/feature_flags/_form.html.haml b/ee/app/views/projects/feature_flags/_form.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_form.html.haml
rename to ee/app/views/projects/feature_flags/_form.html.haml
diff --git a/app/views/projects/feature_flags/_new_feature_flag_button.html.haml b/ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_new_feature_flag_button.html.haml
rename to ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
diff --git a/app/views/projects/feature_flags/_table.html.haml b/ee/app/views/projects/feature_flags/_table.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/_table.html.haml
rename to ee/app/views/projects/feature_flags/_table.html.haml
diff --git a/app/views/projects/feature_flags/edit.html.haml b/ee/app/views/projects/feature_flags/edit.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/edit.html.haml
rename to ee/app/views/projects/feature_flags/edit.html.haml
diff --git a/app/views/projects/feature_flags/index.html.haml b/ee/app/views/projects/feature_flags/index.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/index.html.haml
rename to ee/app/views/projects/feature_flags/index.html.haml
diff --git a/app/views/projects/feature_flags/new.html.haml b/ee/app/views/projects/feature_flags/new.html.haml
similarity index 100%
rename from app/views/projects/feature_flags/new.html.haml
rename to ee/app/views/projects/feature_flags/new.html.haml
diff --git a/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
similarity index 100%
rename from db/migrate/20180626171125_add_feature_flags_to_projects.rb
rename to ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
diff --git a/lib/api/feature_flags.rb b/ee/lib/api/unleash.rb
similarity index 97%
rename from lib/api/feature_flags.rb
rename to ee/lib/api/unleash.rb
index dff43544a75a07..7749c62adeaa27 100644
--- a/lib/api/feature_flags.rb
+++ b/ee/lib/api/unleash.rb
@@ -1,5 +1,5 @@
 module API
-  class FeatureFlags < Grape::API
+  class Unleash < Grape::API
     include PaginationParams
 
     resource :feature_flags do
diff --git a/ee/lib/ee/api/entities.rb b/ee/lib/ee/api/entities.rb
index 4606dc40e1b0d7..c9950dd822925c 100644
--- a/ee/lib/ee/api/entities.rb
+++ b/ee/lib/ee/api/entities.rb
@@ -427,6 +427,23 @@ def missing_oauth_application
           object.geo_node.missing_oauth_application?
         end
       end
+
+      class UnleashFeature < Grape::Entity
+        expose :name
+        expose :description, unless: ->(feature) { feature.description.nil? }
+        expose :active, as: :enabled
+      end
+
+      class UnleashFeatures < Grape::Entity
+        expose :version
+        expose :operations_feature_flags, as: :features, with: UnleashFeature
+
+        private
+
+        def version
+          1
+        end
+      end
     end
   end
 end
diff --git a/ee/lib/ee/gitlab/regex.rb b/ee/lib/ee/gitlab/regex.rb
index 82e081bfac44d0..37c3e8aaa9b256 100644
--- a/ee/lib/ee/gitlab/regex.rb
+++ b/ee/lib/ee/gitlab/regex.rb
@@ -28,6 +28,15 @@ def maven_app_name_regex
       def maven_app_group_regex
         maven_app_name_regex
       end
+
+      def feature_flag_regex
+        /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
+      end
+
+      def feature_flag_regex_message
+        "can contain only lowercase letters, digits, '_' and '-'. " \
+        "Must start with a letter, and cannot end with '-' or '_'"
+      end
     end
   end
 end
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 37d2f91ee93f7e..f665f6b6d84e7d 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -108,7 +108,6 @@ class API < Grape::API
     mount ::API::Environments
     mount ::API::Events
     mount ::API::Features
-    mount ::API::FeatureFlags
     mount ::API::Files
     mount ::API::GroupBoards
     mount ::API::GroupMilestones
@@ -167,6 +166,7 @@ class API < Grape::API
     ## EE-specific API V4 endpoints START
     mount ::EE::API::Boards
     mount ::EE::API::GroupBoards
+    mount ::API::Unleash
 
     mount ::API::EpicIssues
     mount ::API::Epics
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 157a67737314ef..3a68da2a2bb906 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1516,26 +1516,6 @@ class ResourceLabelEvent < Grape::Entity
       expose :label, using: Entities::LabelBasic
       expose :action
     end
-
-    class UnleashFeature < Grape::Entity
-      expose :name
-      expose :description, unless: ->(feature) { feature.description.nil? }
-      expose :active, as: :enabled
-    end
-
-    class UnleashFeatures < Grape::Entity
-      expose :version
-      expose :operations_feature_flags, as: :features, with: UnleashFeature
-
-      private
-
-      def version
-        1
-      end
-
-      def features
-      end
-    end
   end
 end
 
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 0f47381dc4c15d..2a1231f5821d2f 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -71,15 +71,6 @@ def environment_slug_regex_message
       "Must start with a letter, and cannot end with '-'"
     end
 
-    def feature_flag_regex
-      /\A[a-z]([-_a-z0-9]*[a-z0-9])?\z/
-    end
-
-    def feature_flag_regex_message
-      "can contain only lowercase letters, digits, '_' and '-'. " \
-      "Must start with a letter, and cannot end with '-' or '_'"
-    end
-
     def build_trace_section_regex
       @build_trace_section_regexp ||= /section_((?:start)|(?:end)):(\d+):([a-zA-Z0-9_.-]+)\r\033\[0K/.freeze
     end
-- 
GitLab


From 6589156012da82780494def64aba22869ba1e4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 1 Oct 2018 13:50:50 +0200
Subject: [PATCH 36/57] Put Unleash API interface in `/api/v4`

The Unleash API is mounted in:
/api/v4/feature_flags/unleash/:project_id/
---
 ee/lib/api/unleash.rb | 73 +++++++++++++++++++++++--------------------
 lib/api/api.rb        |  2 +-
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/ee/lib/api/unleash.rb b/ee/lib/api/unleash.rb
index 7749c62adeaa27..d2ef6a00aae10a 100644
--- a/ee/lib/api/unleash.rb
+++ b/ee/lib/api/unleash.rb
@@ -2,49 +2,54 @@ module API
   class Unleash < Grape::API
     include PaginationParams
 
-    resource :feature_flags do
-      resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
+    namespace :feature_flags do
+      resource :unleash, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
         params do
-          requires :id, type: String, desc: 'The ID of a project'
+          requires :project_id, type: String, desc: 'The ID of a project'
+          optional :instanceid, type: String, desc: 'The Instance ID of Unleash Client'
         end
-        route_param :id do
-          resource :unleash do
-            before do
-              authenticate_by_unleash_access_token!
-            end
-
-            get 'features' do
-              present project, with: Entities::UnleashFeatures
-            end
-
-            post 'client/register' do
-              # not supported yet
-              status :ok
-            end
-
-            post 'client/metrics' do
-              # not supported yet
-              status :ok
-            end
+        route_param :project_id do
+          before do
+            authenticate_by_unleash_access_token!
           end
-        end
-      end
 
-      helpers do
-        def project
-          @project ||= find_project(params[:id])
-        end
+          get 'features' do
+            present project, with: ::EE::API::Entities::UnleashFeatures
+          end
 
-        def unleash_instanceid
-          params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
-        end
+          post 'client/register' do
+            # not supported yet
+            status :ok
+          end
 
-        def authenticate_by_unleash_access_token!
-          unless Operations::FeatureFlagsAccessToken.find_by(token: unleash_instanceid, project: project)
-            unauthorized!
+          post 'client/metrics' do
+            # not supported yet
+            status :ok
           end
         end
       end
     end
+
+    helpers do
+      def project
+        @project ||= find_project(params[:project_id])
+      end
+
+      def unleash_instanceid
+        params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
+      end
+
+      def unleash_access_token
+        return unless unleash_instanceid
+        return unless project
+
+        @unleash_access_token ||= Operations::FeatureFlagsAccessToken.find_by(
+          token: unleash_instanceid, project: project)
+      end
+
+      def authenticate_by_unleash_access_token!
+        unauthorized! unless unleash_access_token
+      end
+    end
   end
 end
diff --git a/lib/api/api.rb b/lib/api/api.rb
index f665f6b6d84e7d..de8f96c658e8fe 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -166,8 +166,8 @@ class API < Grape::API
     ## EE-specific API V4 endpoints START
     mount ::EE::API::Boards
     mount ::EE::API::GroupBoards
+    
     mount ::API::Unleash
-
     mount ::API::EpicIssues
     mount ::API::Epics
     mount ::API::Geo
-- 
GitLab


From 7098c3a82bf5bc8d86cdcfe44f5d961a6736840f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 1 Oct 2018 16:14:04 +0200
Subject: [PATCH 37/57] First round of spec updates

---
 ee/app/helpers/ee/projects_helper.rb          |  2 +-
 ee/spec/factories/operations/feature_flags.rb |  7 +++++++
 .../operations/feature_flags_access_tokens.rb |  5 +++++
 ee/spec/lib/gitlab/regex_spec.rb              | 10 ++++++++++
 ee/spec/models/project_spec.rb                | 20 +++++++++++++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 ee/spec/factories/operations/feature_flags.rb
 create mode 100644 ee/spec/factories/operations/feature_flags_access_tokens.rb

diff --git a/ee/app/helpers/ee/projects_helper.rb b/ee/app/helpers/ee/projects_helper.rb
index 83503f3e3901b9..d7acfea709d937 100644
--- a/ee/app/helpers/ee/projects_helper.rb
+++ b/ee/app/helpers/ee/projects_helper.rb
@@ -35,7 +35,7 @@ def get_project_nav_tabs(project, current_user)
     override :tab_ability_map
     def tab_ability_map
       tab_ability_map = super
-      tab_ability_map[:feature_flags] = read_feature_flags
+      tab_ability_map[:feature_flags] = :read_feature_flags
       tab_ability_map
     end
 
diff --git a/ee/spec/factories/operations/feature_flags.rb b/ee/spec/factories/operations/feature_flags.rb
new file mode 100644
index 00000000000000..7f5d722df37369
--- /dev/null
+++ b/ee/spec/factories/operations/feature_flags.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :operations_feature_flag, class: Operations::FeatureFlag do
+    sequence(:name) { |n| "feature_flag_#{n}" }
+    project
+    active true
+  end
+end
diff --git a/ee/spec/factories/operations/feature_flags_access_tokens.rb b/ee/spec/factories/operations/feature_flags_access_tokens.rb
new file mode 100644
index 00000000000000..47490c40a1dde1
--- /dev/null
+++ b/ee/spec/factories/operations/feature_flags_access_tokens.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :operations_feature_flags_access_token, class: Operations::FeatureFlagsAccessToken do
+    project
+  end
+end
diff --git a/ee/spec/lib/gitlab/regex_spec.rb b/ee/spec/lib/gitlab/regex_spec.rb
index ad822b27508571..8fba9561983fc8 100644
--- a/ee/spec/lib/gitlab/regex_spec.rb
+++ b/ee/spec/lib/gitlab/regex_spec.rb
@@ -9,4 +9,14 @@
     it { is_expected.to match('foo*Z') }
     it { is_expected.not_to match('!!()()') }
   end
+
+  describe '.feature_flag_regex' do
+    subject { described_class.feature_flag_regex }
+
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('f_feature_flag') }
+    it { is_expected.not_to match('MY_FEATURE_FLAG') }
+    it { is_expected.not_to match('my feature flag') }
+    it { is_expected.not_to match('!!()()') }
+  end
 end
diff --git a/ee/spec/models/project_spec.rb b/ee/spec/models/project_spec.rb
index c99a3f2cdeced1..8df799455b298c 100644
--- a/ee/spec/models/project_spec.rb
+++ b/ee/spec/models/project_spec.rb
@@ -1767,4 +1767,24 @@ def stub_find_remote_root_ref(project, ref:)
         .and_return(ref)
     end
   end
+
+  describe '#feature_flag_access_token' do
+    let(:project) { create(:project) }
+
+    subject { project.feature_flag_access_token }
+
+    context 'when there is no access token' do
+      it "creates a new one" do
+        is_expected.not_to be_empty
+      end
+    end
+
+    context 'when there is access token' do
+      let!(:access_token) { create(:operations_feature_flags_access_token, project: project, token: 'token') }
+
+      it "provides an existing one" do
+        is_expected.to eq('token')
+      end
+    end
+  end
 end
-- 
GitLab


From e7e66184683ab9fc9c7491e374c09140ad3f3d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 08:58:13 +0200
Subject: [PATCH 38/57] Rename access token to instances

---
 db/schema.rb                                          |  6 +++---
 .../20180626171125_add_feature_flags_to_projects.rb   | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 975da6fcae95d2..92e039869a0f8d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1954,12 +1954,12 @@
 
   add_index "operations_feature_flags", ["project_id", "name"], name: "index_operations_feature_flags_on_project_id_and_name", unique: true, using: :btree
 
-  create_table "operations_feature_flags_access_tokens", force: :cascade do |t|
+  create_table "operations_feature_flags_instances", force: :cascade do |t|
     t.integer "project_id", null: false
     t.string "token", null: false
   end
 
-  add_index "operations_feature_flags_access_tokens", ["project_id", "token"], name: "project_feature_flag_access_token", unique: true, using: :btree
+  add_index "operations_feature_flags_instances", ["token"], name: "index_operations_feature_flags_instances_on_token", unique: true, using: :btree
 
   create_table "packages_maven_metadata", id: :bigserial, force: :cascade do |t|
     t.integer "package_id", limit: 8, null: false
@@ -3252,7 +3252,7 @@
   add_foreign_key "notification_settings", "users", name: "fk_0c95e91db7", on_delete: :cascade
   add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_oauth_openid_requests_oauth_access_grants_access_grant_id"
   add_foreign_key "operations_feature_flags", "projects", on_delete: :cascade
-  add_foreign_key "operations_feature_flags_access_tokens", "projects", on_delete: :cascade
+  add_foreign_key "operations_feature_flags_instances", "projects", on_delete: :cascade
   add_foreign_key "packages_maven_metadata", "packages_packages", column: "package_id", name: "fk_be88aed360", on_delete: :cascade
   add_foreign_key "packages_package_files", "packages_packages", column: "package_id", name: "fk_86f0f182f8", on_delete: :cascade
   add_foreign_key "packages_packages", "projects", on_delete: :cascade
diff --git a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index d3232463f61c99..235a73a42334ff 100644
--- a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -4,7 +4,7 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
-  def change
+  def up
     create_table :operations_feature_flags do |t|
       t.integer :project_id, null: false
       t.datetime_with_timezone :created_at, null: false
@@ -19,13 +19,18 @@ def change
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :operations_feature_flags_access_tokens do |t|
+    create_table :operations_feature_flags_instances do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
-      t.index [:project_id, :token], unique: true, name: :project_feature_flag_access_token
+      t.index :token, unique: true
 
       t.foreign_key :projects, column: :project_id, on_delete: :cascade
     end
   end
+
+  def down
+    drop_table :operations_feature_flags
+    drop_table :operations_feature_flags_instances
+  end
 end
-- 
GitLab


From 918d9b5c80437457ec7f95c1060cc97b1358a4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 09:01:50 +0200
Subject: [PATCH 39/57] Rename access token to instances

---
 ee/app/helpers/feature_flags_helper.rb                     | 4 ++--
 ee/app/models/ee/project.rb                                | 7 ++++---
 ...ure_flags_access_token.rb => feature_flags_instance.rb} | 4 ++--
 .../factories/operations/feature_flags_access_tokens.rb    | 5 -----
 ee/spec/factories/operations/feature_flags_instances.rb    | 5 +++++
 ee/spec/models/project_spec.rb                             | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)
 rename ee/app/models/operations/{feature_flags_access_token.rb => feature_flags_instance.rb} (67%)
 delete mode 100644 ee/spec/factories/operations/feature_flags_access_tokens.rb
 create mode 100644 ee/spec/factories/operations/feature_flags_instances.rb

diff --git a/ee/app/helpers/feature_flags_helper.rb b/ee/app/helpers/feature_flags_helper.rb
index 7986b4144dac0d..0ad83c2dcc1d99 100644
--- a/ee/app/helpers/feature_flags_helper.rb
+++ b/ee/app/helpers/feature_flags_helper.rb
@@ -2,10 +2,10 @@
 
 module FeatureFlagsHelper
   def unleash_api_url(project)
-    "#{root_url(only_path: false)}api/v4/feature_flags/projects/#{project.id}/unleash"
+    "#{root_url(only_path: false)}api/v4/feature_flags/unleash/#{project.id}"
   end
 
   def unleash_api_instanceid(project)
-    project.feature_flag_access_token
+    project.feature_flag_instance_token
   end
 end
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index b185302ea762e1..83c48db0001f5d 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -51,7 +51,7 @@ module Project
       has_many :prometheus_alert_events, inverse_of: :project
 
       has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
-      has_one :operations_feature_flags_access_token, class_name: 'Operations::FeatureFlagsAccessToken'
+      has_one :operations_feature_flags_instance, class_name: 'Operations::FeatureFlagsInstance'
 
       scope :with_shared_runners_limit_enabled, -> { with_shared_runners.non_public_only }
 
@@ -562,8 +562,9 @@ def update_root_ref(remote_name)
       change_head(root_ref) if root_ref.present? && root_ref != default_branch
     end
 
-    def feature_flag_access_token
-      (operations_feature_flags_access_token || create_operations_feature_flags_access_token!).token
+    def feature_flags_instance_token
+      instance = operations_feature_flags_instance || create_operations_feature_flags_instance!
+      instance.token
     end
 
     private
diff --git a/ee/app/models/operations/feature_flags_access_token.rb b/ee/app/models/operations/feature_flags_instance.rb
similarity index 67%
rename from ee/app/models/operations/feature_flags_access_token.rb
rename to ee/app/models/operations/feature_flags_instance.rb
index 3f2daf332f4206..91a09c0f10b175 100644
--- a/ee/app/models/operations/feature_flags_access_token.rb
+++ b/ee/app/models/operations/feature_flags_instance.rb
@@ -1,8 +1,8 @@
 module Operations
-  class FeatureFlagsAccessToken < ActiveRecord::Base
+  class FeatureFlagsInstance < ActiveRecord::Base
     include TokenAuthenticatable
 
-    self.table_name = 'operations_feature_flags_access_tokens'
+    self.table_name = 'operations_feature_flags_instances'
 
     belongs_to :project
 
diff --git a/ee/spec/factories/operations/feature_flags_access_tokens.rb b/ee/spec/factories/operations/feature_flags_access_tokens.rb
deleted file mode 100644
index 47490c40a1dde1..00000000000000
--- a/ee/spec/factories/operations/feature_flags_access_tokens.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-FactoryBot.define do
-  factory :operations_feature_flags_access_token, class: Operations::FeatureFlagsAccessToken do
-    project
-  end
-end
diff --git a/ee/spec/factories/operations/feature_flags_instances.rb b/ee/spec/factories/operations/feature_flags_instances.rb
new file mode 100644
index 00000000000000..fec3c1c8cc2392
--- /dev/null
+++ b/ee/spec/factories/operations/feature_flags_instances.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :operations_feature_flags_instance, class: Operations::FeatureFlagsInstance do
+    project
+  end
+end
diff --git a/ee/spec/models/project_spec.rb b/ee/spec/models/project_spec.rb
index 8df799455b298c..0e6cee26d74114 100644
--- a/ee/spec/models/project_spec.rb
+++ b/ee/spec/models/project_spec.rb
@@ -1780,7 +1780,7 @@ def stub_find_remote_root_ref(project, ref:)
     end
 
     context 'when there is access token' do
-      let!(:access_token) { create(:operations_feature_flags_access_token, project: project, token: 'token') }
+      let!(:instance) { create(:operations_feature_flags_instance, project: project, token: 'token') }
 
       it "provides an existing one" do
         is_expected.to eq('token')
-- 
GitLab


From 97a24815284f46389b4c90176cbb8f44144e2715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 09:11:29 +0200
Subject: [PATCH 40/57] Fix feature_flags_helper specs

---
 ee/app/helpers/feature_flags_helper.rb         |  2 +-
 ee/spec/helpers/feature_flags_helper_spec.rb   | 17 +++++++++++++++++
 ee/spec/models/operations/feature_flag_spec.rb |  0
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 ee/spec/helpers/feature_flags_helper_spec.rb
 create mode 100644 ee/spec/models/operations/feature_flag_spec.rb

diff --git a/ee/app/helpers/feature_flags_helper.rb b/ee/app/helpers/feature_flags_helper.rb
index 0ad83c2dcc1d99..a300fc42825659 100644
--- a/ee/app/helpers/feature_flags_helper.rb
+++ b/ee/app/helpers/feature_flags_helper.rb
@@ -6,6 +6,6 @@ def unleash_api_url(project)
   end
 
   def unleash_api_instanceid(project)
-    project.feature_flag_instance_token
+    project.feature_flags_instance_token
   end
 end
diff --git a/ee/spec/helpers/feature_flags_helper_spec.rb b/ee/spec/helpers/feature_flags_helper_spec.rb
new file mode 100644
index 00000000000000..ae27613eb04ddf
--- /dev/null
+++ b/ee/spec/helpers/feature_flags_helper_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe FeatureFlagsHelper do
+  set(:project) { create(:project) }
+
+  context '#unleash_api_url' do
+    subject { helper.unleash_api_url(project) }
+
+    it { is_expected.to end_with("/api/v4/feature_flags/unleash/#{project.id}") }
+  end
+
+  context '#unleash_api_instanceid' do
+    subject { helper.unleash_api_instanceid(project) }
+
+    it { is_expected.not_to be_empty }
+  end
+end
diff --git a/ee/spec/models/operations/feature_flag_spec.rb b/ee/spec/models/operations/feature_flag_spec.rb
new file mode 100644
index 00000000000000..e69de29bb2d1d6
-- 
GitLab


From 7b2af27a100657165f47ddba882c9be73eea3c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 09:27:32 +0200
Subject: [PATCH 41/57] Rename feature_flags_instances to feature_flags_clients

---
 db/schema.rb                                  |  6 +++---
 ee/app/helpers/feature_flags_helper.rb        |  2 +-
 ee/app/models/ee/project.rb                   |  6 +++---
 ee/app/models/operations/feature_flag.rb      |  2 +-
 ...gs_instance.rb => feature_flags_client.rb} |  4 ++--
 ...626171125_add_feature_flags_to_projects.rb |  9 ++-------
 .../operations/feature_flags_clients.rb       |  5 +++++
 .../operations/feature_flags_instances.rb     |  5 -----
 .../models/operations/feature_flag_spec.rb    | 15 +++++++++++++++
 .../operations/feature_flags_client_spec.rb   | 19 +++++++++++++++++++
 ee/spec/models/project_spec.rb                |  2 +-
 11 files changed, 52 insertions(+), 23 deletions(-)
 rename ee/app/models/operations/{feature_flags_instance.rb => feature_flags_client.rb} (69%)
 create mode 100644 ee/spec/factories/operations/feature_flags_clients.rb
 delete mode 100644 ee/spec/factories/operations/feature_flags_instances.rb
 create mode 100644 ee/spec/models/operations/feature_flags_client_spec.rb

diff --git a/db/schema.rb b/db/schema.rb
index 92e039869a0f8d..e3cbd327b9c7b9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1954,12 +1954,12 @@
 
   add_index "operations_feature_flags", ["project_id", "name"], name: "index_operations_feature_flags_on_project_id_and_name", unique: true, using: :btree
 
-  create_table "operations_feature_flags_instances", force: :cascade do |t|
+  create_table "operations_feature_flags_clients", force: :cascade do |t|
     t.integer "project_id", null: false
     t.string "token", null: false
   end
 
-  add_index "operations_feature_flags_instances", ["token"], name: "index_operations_feature_flags_instances_on_token", unique: true, using: :btree
+  add_index "operations_feature_flags_clients", ["token"], name: "index_operations_feature_flags_clients_on_token", unique: true, using: :btree
 
   create_table "packages_maven_metadata", id: :bigserial, force: :cascade do |t|
     t.integer "package_id", limit: 8, null: false
@@ -3252,7 +3252,7 @@
   add_foreign_key "notification_settings", "users", name: "fk_0c95e91db7", on_delete: :cascade
   add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_oauth_openid_requests_oauth_access_grants_access_grant_id"
   add_foreign_key "operations_feature_flags", "projects", on_delete: :cascade
-  add_foreign_key "operations_feature_flags_instances", "projects", on_delete: :cascade
+  add_foreign_key "operations_feature_flags_clients", "projects", on_delete: :cascade
   add_foreign_key "packages_maven_metadata", "packages_packages", column: "package_id", name: "fk_be88aed360", on_delete: :cascade
   add_foreign_key "packages_package_files", "packages_packages", column: "package_id", name: "fk_86f0f182f8", on_delete: :cascade
   add_foreign_key "packages_packages", "projects", on_delete: :cascade
diff --git a/ee/app/helpers/feature_flags_helper.rb b/ee/app/helpers/feature_flags_helper.rb
index a300fc42825659..8a6f897e9761e1 100644
--- a/ee/app/helpers/feature_flags_helper.rb
+++ b/ee/app/helpers/feature_flags_helper.rb
@@ -6,6 +6,6 @@ def unleash_api_url(project)
   end
 
   def unleash_api_instanceid(project)
-    project.feature_flags_instance_token
+    project.feature_flags_client_token
   end
 end
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index 83c48db0001f5d..1a3dacda658ff4 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -51,7 +51,7 @@ module Project
       has_many :prometheus_alert_events, inverse_of: :project
 
       has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
-      has_one :operations_feature_flags_instance, class_name: 'Operations::FeatureFlagsInstance'
+      has_one :operations_feature_flags_client, class_name: 'Operations::FeatureFlagsClient'
 
       scope :with_shared_runners_limit_enabled, -> { with_shared_runners.non_public_only }
 
@@ -562,8 +562,8 @@ def update_root_ref(remote_name)
       change_head(root_ref) if root_ref.present? && root_ref != default_branch
     end
 
-    def feature_flags_instance_token
-      instance = operations_feature_flags_instance || create_operations_feature_flags_instance!
+    def feature_flags_client_token
+      instance = operations_feature_flags_client || create_operations_feature_flags_client!
       instance.token
     end
 
diff --git a/ee/app/models/operations/feature_flag.rb b/ee/app/models/operations/feature_flag.rb
index f447f292f95724..140a67b54c8f8d 100644
--- a/ee/app/models/operations/feature_flag.rb
+++ b/ee/app/models/operations/feature_flag.rb
@@ -13,6 +13,6 @@ class FeatureFlag < ActiveRecord::Base
         message: Gitlab::Regex.feature_flag_regex_message
       }
     validates :name, uniqueness: { scope: :project_id }
-    validates :description, length: 0..255
+    validates :description, allow_blank: true, length: 0..255
   end
 end
diff --git a/ee/app/models/operations/feature_flags_instance.rb b/ee/app/models/operations/feature_flags_client.rb
similarity index 69%
rename from ee/app/models/operations/feature_flags_instance.rb
rename to ee/app/models/operations/feature_flags_client.rb
index 91a09c0f10b175..27e1437c45782e 100644
--- a/ee/app/models/operations/feature_flags_instance.rb
+++ b/ee/app/models/operations/feature_flags_client.rb
@@ -1,8 +1,8 @@
 module Operations
-  class FeatureFlagsInstance < ActiveRecord::Base
+  class FeatureFlagsClient < ActiveRecord::Base
     include TokenAuthenticatable
 
-    self.table_name = 'operations_feature_flags_instances'
+    self.table_name = 'operations_feature_flags_clients'
 
     belongs_to :project
 
diff --git a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 235a73a42334ff..8dba7a68d517d9 100644
--- a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -4,7 +4,7 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
-  def up
+  def change
     create_table :operations_feature_flags do |t|
       t.integer :project_id, null: false
       t.datetime_with_timezone :created_at, null: false
@@ -19,7 +19,7 @@ def up
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :operations_feature_flags_instances do |t|
+    create_table :operations_feature_flags_clients do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
@@ -28,9 +28,4 @@ def up
       t.foreign_key :projects, column: :project_id, on_delete: :cascade
     end
   end
-
-  def down
-    drop_table :operations_feature_flags
-    drop_table :operations_feature_flags_instances
-  end
 end
diff --git a/ee/spec/factories/operations/feature_flags_clients.rb b/ee/spec/factories/operations/feature_flags_clients.rb
new file mode 100644
index 00000000000000..46d2a074133e4e
--- /dev/null
+++ b/ee/spec/factories/operations/feature_flags_clients.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :operations_feature_flags_client, class: Operations::FeatureFlagsClient do
+    project
+  end
+end
diff --git a/ee/spec/factories/operations/feature_flags_instances.rb b/ee/spec/factories/operations/feature_flags_instances.rb
deleted file mode 100644
index fec3c1c8cc2392..00000000000000
--- a/ee/spec/factories/operations/feature_flags_instances.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-FactoryBot.define do
-  factory :operations_feature_flags_instance, class: Operations::FeatureFlagsInstance do
-    project
-  end
-end
diff --git a/ee/spec/models/operations/feature_flag_spec.rb b/ee/spec/models/operations/feature_flag_spec.rb
index e69de29bb2d1d6..726ab8578aa7c8 100644
--- a/ee/spec/models/operations/feature_flag_spec.rb
+++ b/ee/spec/models/operations/feature_flag_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Operations::FeatureFlag do
+  subject { create(:operations_feature_flag) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name).scoped_to(:project_id) }
+  end
+end
diff --git a/ee/spec/models/operations/feature_flags_client_spec.rb b/ee/spec/models/operations/feature_flags_client_spec.rb
new file mode 100644
index 00000000000000..38e10cfdd90dcc
--- /dev/null
+++ b/ee/spec/models/operations/feature_flags_client_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Operations::FeatureFlagsClient do
+  subject { create(:operations_feature_flags_client) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+  end
+
+  describe '#token' do
+    it "ensures that token is always set" do
+      expect(subject.token).not_to be_empty
+    end
+  end
+end
diff --git a/ee/spec/models/project_spec.rb b/ee/spec/models/project_spec.rb
index 0e6cee26d74114..ff9b390044fd85 100644
--- a/ee/spec/models/project_spec.rb
+++ b/ee/spec/models/project_spec.rb
@@ -1780,7 +1780,7 @@ def stub_find_remote_root_ref(project, ref:)
     end
 
     context 'when there is access token' do
-      let!(:instance) { create(:operations_feature_flags_instance, project: project, token: 'token') }
+      let!(:instance) { create(:operations_feature_flags_client, project: project, token: 'token') }
 
       it "provides an existing one" do
         is_expected.to eq('token')
-- 
GitLab


From d2686fe907278e34ae4e45f59a0db04b3c4e8ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 10:17:27 +0200
Subject: [PATCH 42/57] Add feature flags controller specs

---
 .../projects/feature_flags_controller.rb      |   8 +-
 ee/app/helpers/ee/projects_helper.rb          |   4 +-
 ee/app/models/operations/feature_flag.rb      |   2 +
 ee/app/policies/ee/project_policy.rb          |   9 +-
 .../_configure_feature_flags_button.html.haml |   5 +-
 .../_configure_feature_flags_modal.html.haml  | 109 +++++++-------
 .../_delete_feature_flag_modal.html.haml      |  49 +++---
 .../projects/feature_flags/_errors.html.haml  |   4 +
 .../projects/feature_flags/_form.html.haml    |   5 +-
 .../_new_feature_flag_button.html.haml        |   2 +-
 .../projects/feature_flags/_table.html.haml   |  22 +--
 .../projects/feature_flags_controller_spec.rb | 140 ++++++++++++++++++
 12 files changed, 254 insertions(+), 105 deletions(-)
 create mode 100644 ee/app/views/projects/feature_flags/_errors.html.haml
 create mode 100644 ee/spec/controllers/projects/feature_flags_controller_spec.rb

diff --git a/ee/app/controllers/projects/feature_flags_controller.rb b/ee/app/controllers/projects/feature_flags_controller.rb
index a70d8fe3c3337f..427bda3aaa97e6 100644
--- a/ee/app/controllers/projects/feature_flags_controller.rb
+++ b/ee/app/controllers/projects/feature_flags_controller.rb
@@ -1,15 +1,15 @@
 class Projects::FeatureFlagsController < Projects::ApplicationController
   respond_to :html
 
-  before_action :authorize_read_feature_flags!
-  before_action :authorize_update_feature_flags!, only: [:edit, :update]
-  before_action :authorize_admin_feature_flags!, only: [:destroy]
+  before_action :authorize_read_feature_flag!
+  before_action :authorize_update_feature_flag!, only: [:edit, :update]
+  before_action :authorize_destroy_feature_flag!, only: [:destroy]
 
   before_action :feature_flag, only: [:edit, :update, :destroy]
 
   def index
     @feature_flags = project.operations_feature_flags
-      .order(:name)
+      .ordered
       .page(params[:page]).per(30)
   end
 
diff --git a/ee/app/helpers/ee/projects_helper.rb b/ee/app/helpers/ee/projects_helper.rb
index d7acfea709d937..20ce463be15688 100644
--- a/ee/app/helpers/ee/projects_helper.rb
+++ b/ee/app/helpers/ee/projects_helper.rb
@@ -25,7 +25,7 @@ def get_project_nav_tabs(project, current_user)
         nav_tabs << :packages
       end
 
-      if can?(current_user, :read_feature_flags, project) && !nav_tabs.include?(:operations)
+      if can?(current_user, :read_feature_flag, project) && !nav_tabs.include?(:operations)
         nav_tabs << :operations
       end
 
@@ -35,7 +35,7 @@ def get_project_nav_tabs(project, current_user)
     override :tab_ability_map
     def tab_ability_map
       tab_ability_map = super
-      tab_ability_map[:feature_flags] = :read_feature_flags
+      tab_ability_map[:feature_flags] = :read_feature_flag
       tab_ability_map
     end
 
diff --git a/ee/app/models/operations/feature_flag.rb b/ee/app/models/operations/feature_flag.rb
index 140a67b54c8f8d..9980dee548041d 100644
--- a/ee/app/models/operations/feature_flag.rb
+++ b/ee/app/models/operations/feature_flag.rb
@@ -14,5 +14,7 @@ class FeatureFlag < ActiveRecord::Base
       }
     validates :name, uniqueness: { scope: :project_id }
     validates :description, allow_blank: true, length: 0..255
+
+    scope :ordered, -> { order(:name) }
   end
 end
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 515c2694068fc8..15265f3922893b 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -99,9 +99,11 @@ module ProjectPolicy
         enable :admin_board
         enable :admin_vulnerability_feedback
         enable :create_package
-        enable :read_feature_flags
-        enable :create_feature_flags
-        enable :update_feature_flags
+        enable :read_feature_flag
+        enable :create_feature_flag
+        enable :update_feature_flag
+        enable :destroy_feature_flag
+        enable :admin_feature_flag
       end
 
       rule { can?(:public_access) }.enable :read_package
@@ -125,7 +127,6 @@ module ProjectPolicy
         enable :admin_path_locks
         enable :update_approvers
         enable :destroy_package
-        enable :admin_feature_flags
       end
 
       rule { license_management_enabled & can?(:maintainer_access) }.enable :admin_software_license_policy
diff --git a/ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
index b1336b02967423..dde8aca6383800 100644
--- a/ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
+++ b/ee/app/views/projects/feature_flags/_configure_feature_flags_button.html.haml
@@ -1,2 +1,3 @@
-%button.btn.btn-primary.btn-inverted.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
-  = s_('FeatureFlags|Configure')
+- if can?(current_user, :admin_feature_flag, @project)
+  %button.btn.btn-primary.btn-inverted.append-right-8{ type: 'button', data: { toggle: 'modal', target: '#configure-feature-flags-modal' } }>
+    = s_('FeatureFlags|Configure')
diff --git a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index 4968f898947114..8ad4f864e4fa2d 100644
--- a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -1,57 +1,58 @@
-#configure-feature-flags-modal.modal{ tabindex: -1,
-  role: 'dialog' }
-  .modal-dialog{ role: 'document' }
-    .modal-content
-      .modal-header
-        %h5.modal-title
-          = s_('FeatureFlags|Configure feature flags')
-        %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
-          %span{ "aria-hidden": true } &times;
-      .modal-body
-        %p
-          - client_libraries_url = help_page_path("user/project/operations/feature_flags", anchor: "client-libraries")
-          = s_('FeatureFlags|Install a %{docs_link_start}compatible client library%{docs_link_end} and specify the API URL, application name, and instance ID during the configuration setup.').html_safe % { docs_link_start: %Q{<a href="#{client_libraries_url}">}.html_safe,
-            docs_link_end: '</a>'.html_safe }
-          = link_to s_('FeatureFlags|More information'), help_page_path("user/project/operations/feature_flags")
+- if can?(current_user, :admin_feature_flag, @project)
+  #configure-feature-flags-modal.modal{ tabindex: -1,
+    role: 'dialog' }
+    .modal-dialog{ role: 'document' }
+      .modal-content
+        .modal-header
+          %h5.modal-title
+            = s_('FeatureFlags|Configure feature flags')
+          %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
+            %span{ "aria-hidden": true } &times;
+        .modal-body
+          %p
+            - client_libraries_url = help_page_path("user/project/operations/feature_flags", anchor: "client-libraries")
+            = s_('FeatureFlags|Install a %{docs_link_start}compatible client library%{docs_link_end} and specify the API URL, application name, and instance ID during the configuration setup.').html_safe % { docs_link_start: %Q{<a href="#{client_libraries_url}">}.html_safe,
+              docs_link_end: '</a>'.html_safe }
+            = link_to s_('FeatureFlags|More information'), help_page_path("user/project/operations/feature_flags")
 
-        .form-group
-          = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-bold'
-          .input-group
-            = text_field_tag :api_url,
-              unleash_api_url(@project),
-              readonly: true,
-              class: "form-control js-select-on-focus"
-            %span.input-group-append
-              = clipboard_button(target: '#api_url',
-                title: _("Copy URL to clipboard"),
-                placement: "left",
-                container: '#configure-feature-flags-modal',
-                class: "input-group-text btn btn-default")
+          .form-group
+            = label_tag :api_url, s_('FeatureFlags|API URL'), class: 'label-bold'
+            .input-group
+              = text_field_tag :api_url,
+                unleash_api_url(@project),
+                readonly: true,
+                class: "form-control js-select-on-focus"
+              %span.input-group-append
+                = clipboard_button(target: '#api_url',
+                  title: _("Copy URL to clipboard"),
+                  placement: "left",
+                  container: '#configure-feature-flags-modal',
+                  class: "input-group-text btn btn-default")
 
-        .form-group
-          = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-bold'
-          .input-group
-            = text_field_tag :instance_id,
-              unleash_api_instanceid(@project),
-              readonly: true,
-              class: "form-control js-select-on-focus"
-            %span.input-group-append
-              = clipboard_button(target: '#instance_id',
-                title: _("Copy ID to clipboard"),
-                placement: "left",
-                container: '#configure-feature-flags-modal',
-                class: "input-group-text btn btn-default")
+          .form-group
+            = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-bold'
+            .input-group
+              = text_field_tag :instance_id,
+                unleash_api_instanceid(@project),
+                readonly: true,
+                class: "form-control js-select-on-focus"
+              %span.input-group-append
+                = clipboard_button(target: '#instance_id',
+                  title: _("Copy ID to clipboard"),
+                  placement: "left",
+                  container: '#configure-feature-flags-modal',
+                  class: "input-group-text btn btn-default")
 
-        .form-group
-          = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-bold'
-          .input-group
-            = text_field_tag :application_name,
-              "production",
-              readonly: true,
-              class: "form-control js-select-on-focus"
-            %span.input-group-append
-              = clipboard_button(target: '#application_name',
-                title: _("Copy name to clipboard"),
-                placement: "left",
-                container: '#configure-feature-flags-modal',
-                class: "input-group-text btn btn-default")
+          .form-group
+            = label_tag :application_name, s_('FeatureFlags|Application name'), class: 'label-bold'
+            .input-group
+              = text_field_tag :application_name,
+                "production",
+                readonly: true,
+                class: "form-control js-select-on-focus"
+              %span.input-group-append
+                = clipboard_button(target: '#application_name',
+                  title: _("Copy name to clipboard"),
+                  placement: "left",
+                  container: '#configure-feature-flags-modal',
+                  class: "input-group-text btn btn-default")
diff --git a/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
index 02269049b606d4..d94e917befeb3a 100644
--- a/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
+++ b/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
@@ -1,25 +1,26 @@
-.modal{ id: "delete-feature-flag-modal-#{feature_flag.id}",
-  tabindex: -1,
-  role: 'dialog' }
-  .modal-dialog{ role: 'document' }
-    .modal-content
-      .modal-header
-        %h5.modal-title.d-flex.mw-100
-          - truncated_feature_flag_name = capture do
-            %span.text-truncate.prepend-left-4.append-right-4= feature_flag.name
-          = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: truncated_feature_flag_name }
-        %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
-          %span{ "aria-hidden": true } &times;
-      .modal-body
-        %p
-          - monospace_feature_flag_name = capture do
-            %span.text-monospace= feature_flag.name
-          = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?').html_safe % { feature_flag_name: monospace_feature_flag_name }
-      .modal-footer
-        %button{ type: 'button', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
+- if can?(current_user, :destroy_feature_flag, @project)
+  .modal{ id: "delete-feature-flag-modal-#{feature_flag.id}",
+    tabindex: -1,
+    role: 'dialog' }
+    .modal-dialog{ role: 'document' }
+      .modal-content
+        .modal-header
+          %h5.modal-title.d-flex.mw-100
+            - truncated_feature_flag_name = capture do
+              %span.text-truncate.prepend-left-4.append-right-4= feature_flag.name
+            = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: truncated_feature_flag_name }
+          %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
+            %span{ "aria-hidden": true } &times;
+        .modal-body
+          %p
+            - monospace_feature_flag_name = capture do
+              %span.text-monospace= feature_flag.name
+            = s_('FeatureFlags|Feature flag %{feature_flag_name} will be removed. Are you sure?').html_safe % { feature_flag_name: monospace_feature_flag_name }
+        .modal-footer
+          %button{ type: 'button', data: { dismiss: 'modal' }, class: 'btn btn-default' } Cancel
 
-        = button_to 'Delete',
-          project_feature_flag_path(@project, feature_flag),
-          title: 'Delete',
-          method: :delete,
-          class: 'btn btn-remove'
+          = button_to 'Delete',
+            project_feature_flag_path(@project, feature_flag),
+            title: 'Delete',
+            method: :delete,
+            class: 'btn btn-remove'
diff --git a/ee/app/views/projects/feature_flags/_errors.html.haml b/ee/app/views/projects/feature_flags/_errors.html.haml
new file mode 100644
index 00000000000000..8fb4bd22712082
--- /dev/null
+++ b/ee/app/views/projects/feature_flags/_errors.html.haml
@@ -0,0 +1,4 @@
+#error_explanation
+  .alert.alert-danger
+    - @feature_flag.errors.full_messages.each do |msg|
+      %p= msg
diff --git a/ee/app/views/projects/feature_flags/_form.html.haml b/ee/app/views/projects/feature_flags/_form.html.haml
index 26a1b4a2f14b08..497ae478e08f9a 100644
--- a/ee/app/views/projects/feature_flags/_form.html.haml
+++ b/ee/app/views/projects/feature_flags/_form.html.haml
@@ -1,8 +1,5 @@
 - if @feature_flag.errors.any?
-  #error_explanation
-    .alert.alert-danger
-      - @feature_flag.errors.full_messages.each do |msg|
-        %p= msg
+  = render 'errors'
 
 %fieldset
   .row
diff --git a/ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml b/ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
index c2901f41a6aa05..fe7e8f044768f2 100644
--- a/ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
+++ b/ee/app/views/projects/feature_flags/_new_feature_flag_button.html.haml
@@ -1,3 +1,3 @@
-- if can?(current_user, :create_feature_flags, @project)
+- if can?(current_user, :create_feature_flag, @project)
   = link_to new_project_feature_flag_path(@project), class: 'btn btn-success' do
     = s_('FeatureFlags|New Feature Flag')
diff --git a/ee/app/views/projects/feature_flags/_table.html.haml b/ee/app/views/projects/feature_flags/_table.html.haml
index 9570725e6ebe0d..ccd7ac967b8086 100644
--- a/ee/app/views/projects/feature_flags/_table.html.haml
+++ b/ee/app/views/projects/feature_flags/_table.html.haml
@@ -24,16 +24,18 @@
 
       .table-section.section-40.table-button-footer{ role: 'gridcell' }
         .table-action-buttons.btn-group
-          = link_to edit_project_feature_flag_path(@project, feature_flag),
-              class: 'btn btn-default has-tooltip',
-              type: 'button',
-              title: _('Edit') do
-            = sprite_icon('pencil', size: 16)
+          - if can?(current_user, :update_feature_flag, @project)
+            = link_to edit_project_feature_flag_path(@project, feature_flag),
+                class: 'btn btn-default has-tooltip',
+                type: 'button',
+                title: _('Edit') do
+              = sprite_icon('pencil', size: 16)
 
-          %button.btn.btn-danger.has-tooltip{ type: 'button',
-              data: { toggle: 'modal',
-                target: "#delete-feature-flag-modal-#{feature_flag.id}" },
-              title: _('Delete') }
-            = sprite_icon('remove', size: 16)
+          - if can?(current_user, :destroy_feature_flag, @project)
+            %button.btn.btn-danger.has-tooltip{ type: 'button',
+                data: { toggle: 'modal',
+                  target: "#delete-feature-flag-modal-#{feature_flag.id}" },
+                title: _('Delete') }
+              = sprite_icon('remove', size: 16)
 
 = paginate @feature_flags, theme: "gitlab"
diff --git a/ee/spec/controllers/projects/feature_flags_controller_spec.rb b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
new file mode 100644
index 00000000000000..61ada3fd196f34
--- /dev/null
+++ b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
@@ -0,0 +1,140 @@
+require 'spec_helper'
+
+describe Projects::FeatureFlagsController do
+  include Rails.application.routes.url_helpers
+
+  set(:user) { create(:user) }
+  set(:project) { create(:project) }
+
+  before do
+    project.add_developer(user)
+
+    sign_in(user)
+  end
+
+  describe 'GET index' do
+    render_views
+
+    subject { get(:index, view_params) }
+
+    context 'when there is no feature flags' do
+      before do
+        subject
+      end
+
+      it 'shows an empty state with buttons' do
+        expect(response).to be_ok
+        expect(response).to render_template('_empty_state')
+        expect(response).to render_template('_configure_feature_flags_button')
+        expect(response).to render_template('_new_feature_flag_button')
+      end
+    end
+
+    context 'for a list of feature flags' do
+      let!(:feature_flags) { create_list(:operations_feature_flag, 50, project: project) }
+
+      before do
+        subject
+      end
+
+      it 'shows an list of feature flags with buttons' do
+        expect(response).to be_ok
+        expect(response).to render_template('_table')
+        expect(response).to render_template('_configure_feature_flags_button')
+        expect(response).to render_template('_new_feature_flag_button')
+      end
+    end
+  end
+
+  describe 'GET new' do
+    render_views
+
+    subject { get(:new, view_params) }
+
+    it 'renders the form' do
+      subject
+      
+      expect(response).to be_ok
+      expect(response).to render_template('new')
+      expect(response).to render_template('_form')
+    end
+  end
+
+  describe 'POST create' do
+    render_views
+
+    subject { post(:create, params) }
+
+    context 'when creating a new feature flag' do
+      let(:params) do
+        view_params.merge(operations_feature_flag: { name: 'my_feature_flag', active: true })
+      end
+
+      it 'creates and redirects to list' do
+        subject
+
+        expect(response).to redirect_to(project_feature_flags_path(project))
+      end
+    end
+
+    context 'when a feature flag already exists' do
+      let!(:feature_flag) { create(:operations_feature_flag, project: project, name: 'my_feature_flag') }
+
+      let(:params) do
+        view_params.merge(operations_feature_flag: { name: 'my_feature_flag', active: true })
+      end
+
+      it 'shows an error' do
+        subject
+
+        expect(response).to render_template('new')
+        expect(response).to render_template('_errors')
+      end
+    end
+  end
+
+  describe 'PUT update' do
+    let!(:feature_flag) { create(:operations_feature_flag, project: project, name: 'my_feature_flag') }
+
+    render_views
+
+    subject { post(:create, params) }
+
+    context 'when updating an existing feature flag' do
+      let(:params) do
+        view_params.merge(
+          id: feature_flag.id,
+          operations_feature_flag: { name: 'my_feature_flag_v2', active: true }
+        )
+      end
+
+      it 'updates and redirects to list' do
+        subject
+
+        expect(response).to redirect_to(project_feature_flags_path(project))
+      end
+    end
+
+    context 'when using existing name of the feature flag' do
+      let!(:other_feature_flag) { create(:operations_feature_flag, project: project, name: 'other_feature_flag') }
+
+      let(:params) do
+        view_params.merge(operations_feature_flag: { name: 'other_feature_flag', active: true })
+      end
+
+      it 'shows an error' do
+        subject
+
+        expect(response).to render_template('new')
+        expect(response).to render_template('_errors')
+      end
+    end
+  end
+
+  private
+
+  def view_params
+    { namespace_id: project.namespace, project_id: project }
+  end
+end
+
-- 
GitLab


From a1c102233720e831cb537fefa528b1e04d23dde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 10:29:24 +0200
Subject: [PATCH 43/57] Fix controller status rubocop rules

---
 .../controllers/projects/feature_flags_controller.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ee/app/controllers/projects/feature_flags_controller.rb b/ee/app/controllers/projects/feature_flags_controller.rb
index 427bda3aaa97e6..e12e513af14d67 100644
--- a/ee/app/controllers/projects/feature_flags_controller.rb
+++ b/ee/app/controllers/projects/feature_flags_controller.rb
@@ -21,8 +21,7 @@ def create
     @feature_flag = project.operations_feature_flags.create(create_params)
 
     if @feature_flag.persisted?
-      flash[:notice] = 'Feature flag was successfully created.'
-      redirect_to project_feature_flags_path(@project)
+      redirect_to project_feature_flags_path(@project), status: 302, notice: 'Feature flag was successfully created.'
     else
       render :new
     end
@@ -33,8 +32,7 @@ def edit
 
   def update
     if feature_flag.update(update_params)
-      flash[:notice] = 'Feature flag was successfully updated.'
-      redirect_to project_feature_flags_path(@project)
+      redirect_to project_feature_flags_path(@project), status: 302, notice: 'Feature flag was successfully updated.'
     else
       render :edit
     end
@@ -42,10 +40,10 @@ def update
 
   def destroy
     if feature_flag.destroy
-      flash[:notice] = 'Feature flag was successfully removed.'
+      redirect_to project_feature_flags_path(@project), status: 302, notice: 'Feature flag was successfully removed.'
+    else
+      redirect_to project_feature_flags_path(@project), status: 302, alert: 'Feature flag was not removed.'
     end
-
-    redirect_to project_feature_flags_path(@project)
   end
 
   protected
-- 
GitLab


From 75c459e64dc15be04beedb6af1160df40dbe8a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:04:24 +0200
Subject: [PATCH 44/57] Add Unleash API specs

---
 .../models/operations/feature_flags_client.rb |  7 ++
 ee/lib/api/unleash.rb                         | 17 +---
 ee/lib/ee/api/entities.rb                     |  6 +-
 .../lib/gitlab/import_export/all_models.yml   |  2 +
 ee/spec/models/project_spec.rb                |  4 +-
 ee/spec/requests/api/unleash_spec.rb          | 95 +++++++++++++++++++
 6 files changed, 116 insertions(+), 15 deletions(-)
 create mode 100644 ee/spec/requests/api/unleash_spec.rb

diff --git a/ee/app/models/operations/feature_flags_client.rb b/ee/app/models/operations/feature_flags_client.rb
index 27e1437c45782e..75da25daafd75b 100644
--- a/ee/app/models/operations/feature_flags_client.rb
+++ b/ee/app/models/operations/feature_flags_client.rb
@@ -12,5 +12,12 @@ class FeatureFlagsClient < ActiveRecord::Base
     add_authentication_token_field :token
 
     before_validation :ensure_token!
+
+    def self.find_for_project_and_token(project, token)
+      return unless project
+      return unless token
+
+      find_by(token: token, project: project)
+    end
   end
 end
diff --git a/ee/lib/api/unleash.rb b/ee/lib/api/unleash.rb
index d2ef6a00aae10a..fe1fde1164672a 100644
--- a/ee/lib/api/unleash.rb
+++ b/ee/lib/api/unleash.rb
@@ -10,7 +10,7 @@ class Unleash < Grape::API
         end
         route_param :project_id do
           before do
-            authenticate_by_unleash_access_token!
+            authenticate_by_unleash_instanceid!
           end
 
           get 'features' do
@@ -36,19 +36,12 @@ def project
       end
 
       def unleash_instanceid
-        params[:instanceid] || env[:HTTP_UNLEASH_INSTANCEID]
+        params[:instanceid] || env['HTTP_UNLEASH_INSTANCEID']
       end
 
-      def unleash_access_token
-        return unless unleash_instanceid
-        return unless project
-
-        @unleash_access_token ||= Operations::FeatureFlagsAccessToken.find_by(
-          token: unleash_instanceid, project: project)
-      end
-
-      def authenticate_by_unleash_access_token!
-        unauthorized! unless unleash_access_token
+      def authenticate_by_unleash_instanceid!
+        unauthorized! unless Operations::FeatureFlagsClient
+          .find_for_project_and_token(project, unleash_instanceid)
       end
     end
   end
diff --git a/ee/lib/ee/api/entities.rb b/ee/lib/ee/api/entities.rb
index c9950dd822925c..917d90544f9e19 100644
--- a/ee/lib/ee/api/entities.rb
+++ b/ee/lib/ee/api/entities.rb
@@ -436,13 +436,17 @@ class UnleashFeature < Grape::Entity
 
       class UnleashFeatures < Grape::Entity
         expose :version
-        expose :operations_feature_flags, as: :features, with: UnleashFeature
+        expose :features, with: UnleashFeature
 
         private
 
         def version
           1
         end
+
+        def features
+          object.operations_feature_flags.ordered
+        end
       end
     end
   end
diff --git a/ee/spec/lib/gitlab/import_export/all_models.yml b/ee/spec/lib/gitlab/import_export/all_models.yml
index b89171dcd365cf..520d9c149ede0d 100644
--- a/ee/spec/lib/gitlab/import_export/all_models.yml
+++ b/ee/spec/lib/gitlab/import_export/all_models.yml
@@ -56,6 +56,8 @@ project:
 - vulnerability_feedback
 - vulnerability_identifiers
 - vulnerability_scanners
+- operations_feature_flags
+- operations_feature_flags_instance
 - prometheus_alerts
 - prometheus_alert_events
 - software_license_policies
diff --git a/ee/spec/models/project_spec.rb b/ee/spec/models/project_spec.rb
index ff9b390044fd85..f5544dff7bcee0 100644
--- a/ee/spec/models/project_spec.rb
+++ b/ee/spec/models/project_spec.rb
@@ -1768,10 +1768,10 @@ def stub_find_remote_root_ref(project, ref:)
     end
   end
 
-  describe '#feature_flag_access_token' do
+  describe '#feature_flags_client_token' do
     let(:project) { create(:project) }
 
-    subject { project.feature_flag_access_token }
+    subject { project.feature_flags_client_token }
 
     context 'when there is no access token' do
       it "creates a new one" do
diff --git a/ee/spec/requests/api/unleash_spec.rb b/ee/spec/requests/api/unleash_spec.rb
new file mode 100644
index 00000000000000..04dc19ded6244a
--- /dev/null
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe API::Unleash do
+  set(:project) { create(:project) }
+  let(:project_id) { project.id }
+  let(:params) { }
+  let(:headers) { }
+
+  shared_examples 'authenticated request' do
+    context 'when using instanceid' do
+      let(:client) { create(:operations_feature_flags_client, project: project) }
+      let(:params) { { instanceid: client.token } }
+
+      it 'responds with OK' do
+        subject
+
+        expect(response).to have_gitlab_http_status(200)
+      end
+    end
+
+    context 'when using header' do
+      let(:client) { create(:operations_feature_flags_client, project: project) }
+      let(:headers) { { "UNLEASH-INSTANCEID" => client.token }}
+
+      it 'responds with OK' do
+        subject
+
+        expect(response).to have_gitlab_http_status(200)
+      end
+    end
+
+    context 'when using bogus instanceid' do
+      let(:params) { { instanceid: 'token' } }
+
+      it 'responds with unauthorized' do
+        subject
+
+        expect(response).to have_gitlab_http_status(401)
+      end
+    end
+
+    context 'when using not existing project' do
+      let(:project_id) { -5000 }
+      let(:params) { { instanceid: 'token' } }
+
+      it 'responds with unauthorized' do
+        subject
+
+        expect(response).to have_gitlab_http_status(401)
+      end
+    end
+  end
+
+  describe 'GET /feature_flags/unleash/:project_id/features' do
+    subject { get api("/feature_flags/unleash/#{project_id}/features"), params, headers }
+
+    it_behaves_like 'authenticated request'
+
+    context 'with a list of feature flag' do
+      let(:client) { create(:operations_feature_flags_client, project: project) }
+      let(:headers) { { "UNLEASH-INSTANCEID" => client.token }}
+      let!(:enable_feature_flag) { create(:operations_feature_flag, project: project, name: 'feature1', active: true) }
+      let!(:disabled_feature_flag) { create(:operations_feature_flag, project: project, name: 'feature2', active: false) }
+
+      it 'responds with a list' do
+        subject
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['version']).to eq(1)
+        expect(json_response['features']).not_to be_empty
+        expect(json_response['features'].first['name']).to eq('feature1')
+      end
+
+      it 'matches json schema' do
+        subject
+        
+        expect(response).to have_gitlab_http_status(:ok)
+
+        # TODO: match schema
+      end
+    end
+  end
+
+  describe 'POST /feature_flags/unleash/:project_id/client/register' do
+    subject { post api("/feature_flags/unleash/#{project_id}/client/register"), params, headers }
+
+    it_behaves_like 'authenticated request'
+  end
+
+  describe 'POST /feature_flags/unleash/:project_id/client/metrics' do
+    subject { post api("/feature_flags/unleash/#{project_id}/client/metrics"), params, headers }
+
+    it_behaves_like 'authenticated request'
+  end
+end
-- 
GitLab


From 0fd3f91f6fd2f051cbeb9c0e020a9b604e9c1205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:08:46 +0200
Subject: [PATCH 45/57] Add Unleash json schema

---
 .../fixtures/api/schemas/unleash/unleash.json | 20 +++++++++++++++++++
 .../api/schemas/unleash/unleash_feature.json  | 19 ++++++++++++++++++
 ee/spec/requests/api/unleash_spec.rb          |  3 +--
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 ee/spec/fixtures/api/schemas/unleash/unleash.json
 create mode 100644 ee/spec/fixtures/api/schemas/unleash/unleash_feature.json

diff --git a/ee/spec/fixtures/api/schemas/unleash/unleash.json b/ee/spec/fixtures/api/schemas/unleash/unleash.json
new file mode 100644
index 00000000000000..6eaf316bb11a57
--- /dev/null
+++ b/ee/spec/fixtures/api/schemas/unleash/unleash.json
@@ -0,0 +1,20 @@
+{
+  "additionalProperties": false,
+  "properties": {
+    "features": {
+      "items": {
+        "$ref": "unleash_feature.json"
+      },
+      "minItems": 0,
+      "type": "array"
+    },
+    "version": {
+      "type": "integer"
+    }
+  },
+  "required": [
+    "version",
+    "features"
+  ],
+  "type": "object"
+}
diff --git a/ee/spec/fixtures/api/schemas/unleash/unleash_feature.json b/ee/spec/fixtures/api/schemas/unleash/unleash_feature.json
new file mode 100644
index 00000000000000..25ef1f6da60989
--- /dev/null
+++ b/ee/spec/fixtures/api/schemas/unleash/unleash_feature.json
@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "enabled"
+  ],
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "enabled": {
+      "type": "boolean"
+    },
+    "description": {
+      "type": "string"
+    }
+  }
+}
diff --git a/ee/spec/requests/api/unleash_spec.rb b/ee/spec/requests/api/unleash_spec.rb
index 04dc19ded6244a..4adbce80f75cab 100644
--- a/ee/spec/requests/api/unleash_spec.rb
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -75,8 +75,7 @@
         subject
         
         expect(response).to have_gitlab_http_status(:ok)
-
-        # TODO: match schema
+        expect(response).to match_response_schema('unleash/unleash', dir: 'ee')
       end
     end
   end
-- 
GitLab


From 6e01d70dfcd320312d91899a44b6426e88c4ae8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:12:08 +0200
Subject: [PATCH 46/57] Add Changelog

---
 ee/changelogs/unreleased/feature-flags-mvc-ee.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 ee/changelogs/unreleased/feature-flags-mvc-ee.yml

diff --git a/ee/changelogs/unreleased/feature-flags-mvc-ee.yml b/ee/changelogs/unreleased/feature-flags-mvc-ee.yml
new file mode 100644
index 00000000000000..8a7994e1165118
--- /dev/null
+++ b/ee/changelogs/unreleased/feature-flags-mvc-ee.yml
@@ -0,0 +1,5 @@
+---
+title: Add Feature Flags MVC
+merge_request:
+author:
+type: added
-- 
GitLab


From 25907d0f3055fc64b803c9cb458b1c04d5b551b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:15:49 +0200
Subject: [PATCH 47/57] Limit feature flags to EEP

---
 ee/app/models/license.rb                          |  1 +
 ee/app/policies/ee/project_policy.rb              |  9 +++++++++
 ee/lib/api/unleash.rb                             |  9 +++++++--
 .../projects/feature_flags_controller_spec.rb     | 14 ++++++++++++++
 ee/spec/requests/api/unleash_spec.rb              | 15 +++++++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb
index 78aa3b0b340a0e..ca349a535f90df 100644
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
@@ -67,6 +67,7 @@ class License < ActiveRecord::Base
     custom_project_templates
     packages
     code_owner_as_approver_suggestion
+    feature_flags
   ].freeze
 
   EEU_FEATURES = EEP_FEATURES + %i[
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 15265f3922893b..9c7f33f1f1a6d4 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -65,6 +65,11 @@ module ProjectPolicy
         @subject.feature_available?(:license_management)
       end
 
+      with_scope :subject
+      condition(:feature_flags_disabled) do
+        !@subject.feature_available?(:feature_flags)
+      end
+
       rule { admin }.enable :change_repository_storage
 
       rule { support_bot }.enable :guest_access
@@ -122,6 +127,10 @@ module ProjectPolicy
         prevent(*create_read_update_admin_destroy(:package))
       end
 
+      rule { feature_flags_disabled }.policy do
+        prevent(*create_read_update_admin_destroy(:feature_flag))
+      end
+
       rule { can?(:maintainer_access) }.policy do
         enable :push_code_to_protected_branches
         enable :admin_path_locks
diff --git a/ee/lib/api/unleash.rb b/ee/lib/api/unleash.rb
index fe1fde1164672a..e58a4a44b8bb85 100644
--- a/ee/lib/api/unleash.rb
+++ b/ee/lib/api/unleash.rb
@@ -10,7 +10,8 @@ class Unleash < Grape::API
         end
         route_param :project_id do
           before do
-            authenticate_by_unleash_instanceid!
+            authorize_by_unleash_instanceid!
+            authorize_feature_flags_feature!
           end
 
           get 'features' do
@@ -39,10 +40,14 @@ def unleash_instanceid
         params[:instanceid] || env['HTTP_UNLEASH_INSTANCEID']
       end
 
-      def authenticate_by_unleash_instanceid!
+      def authorize_by_unleash_instanceid!
         unauthorized! unless Operations::FeatureFlagsClient
           .find_for_project_and_token(project, unleash_instanceid)
       end
+
+      def authorize_feature_flags_feature!
+        forbidden! unless project.feature_available?(:feature_flags)
+      end
     end
   end
 end
diff --git a/ee/spec/controllers/projects/feature_flags_controller_spec.rb b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
index 61ada3fd196f34..a73cc7e46f094d 100644
--- a/ee/spec/controllers/projects/feature_flags_controller_spec.rb
+++ b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
@@ -5,11 +5,13 @@
 
   set(:user) { create(:user) }
   set(:project) { create(:project) }
+  let(:feature_enabled) { true }
 
   before do
     project.add_developer(user)
 
     sign_in(user)
+    stub_licensed_features(feature_flags: feature_enabled)
   end
 
   describe 'GET index' do
@@ -44,6 +46,18 @@
         expect(response).to render_template('_new_feature_flag_button')
       end
     end
+
+    context 'when feature is not available' do
+      let(:feature_enabled) { false }
+
+      before do
+        subject
+      end
+
+      it 'shows not found' do
+        expect(subject).to have_gitlab_http_status(404)
+      end
+    end
   end
 
   describe 'GET new' do
diff --git a/ee/spec/requests/api/unleash_spec.rb b/ee/spec/requests/api/unleash_spec.rb
index 4adbce80f75cab..89e62e7c961bcb 100644
--- a/ee/spec/requests/api/unleash_spec.rb
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -3,9 +3,14 @@
 describe API::Unleash do
   set(:project) { create(:project) }
   let(:project_id) { project.id }
+  let(:feature_enabled) { true }
   let(:params) { }
   let(:headers) { }
 
+  before do
+    stub_licensed_features(feature_flags: feature_enabled)
+  end
+
   shared_examples 'authenticated request' do
     context 'when using instanceid' do
       let(:client) { create(:operations_feature_flags_client, project: project) }
@@ -16,6 +21,16 @@
 
         expect(response).to have_gitlab_http_status(200)
       end
+
+      context 'when feature is not available' do
+        let(:feature_enabled) { false }
+
+        it 'responds with forbidden' do
+          subject
+
+          expect(response).to have_gitlab_http_status(403)
+        end
+      end
     end
 
     context 'when using header' do
-- 
GitLab


From ec3838723e9637cc36d73a6d6535267370ebabf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:27:51 +0200
Subject: [PATCH 48/57] Optimise Feature Flags DB schema

---
 db/schema.rb                                                | 6 +++---
 .../migrate/20180626171125_add_feature_flags_to_projects.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index e3cbd327b9c7b9..a2dba21bd9a2ee 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1943,18 +1943,18 @@
     t.string "nonce", null: false
   end
 
-  create_table "operations_feature_flags", force: :cascade do |t|
+  create_table "operations_feature_flags", id: :bigserial, force: :cascade do |t|
     t.integer "project_id", null: false
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
+    t.boolean "active", null: false
     t.string "name", null: false
     t.text "description"
-    t.boolean "active", null: false
   end
 
   add_index "operations_feature_flags", ["project_id", "name"], name: "index_operations_feature_flags_on_project_id_and_name", unique: true, using: :btree
 
-  create_table "operations_feature_flags_clients", force: :cascade do |t|
+  create_table "operations_feature_flags_clients", id: :bigserial, force: :cascade do |t|
     t.integer "project_id", null: false
     t.string "token", null: false
   end
diff --git a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 8dba7a68d517d9..74ce0d5df159a8 100644
--- a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -5,21 +5,21 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   DOWNTIME = false
 
   def change
-    create_table :operations_feature_flags do |t|
+    create_table :operations_feature_flags, id: :bigserial do |t|
       t.integer :project_id, null: false
       t.datetime_with_timezone :created_at, null: false
       t.datetime_with_timezone :updated_at, null: false
 
+      t.boolean :active, null: false
       t.string :name, null: false
       t.text :description
-      t.boolean :active, null: false
 
       t.foreign_key :projects, column: :project_id, on_delete: :cascade
 
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :operations_feature_flags_clients do |t|
+    create_table :operations_feature_flags_clients, id: :bigserial  do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
-- 
GitLab


From 95ed2c38a80e3e80e9ba4f2d85209b70bf43c371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 11:35:57 +0200
Subject: [PATCH 49/57] Revert unneeded changes

---
 app/policies/project_policy.rb                   | 2 --
 app/views/layouts/nav/sidebar/_project.html.haml | 4 ++--
 ee/app/policies/ee/project_policy.rb             | 1 +
 lib/api/api.rb                                   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 12c49efd5b9a13..7c1450c20cdb4f 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -15,7 +15,6 @@ class ProjectPolicy < BasePolicy
     note
     pipeline
     pipeline_schedule
-    feature_flags
     build
     trigger
     environment
@@ -307,7 +306,6 @@ class ProjectPolicy < BasePolicy
     prevent(*create_read_update_admin_destroy(:build))
     prevent(*create_read_update_admin_destroy(:pipeline_schedule))
     prevent(*create_read_update_admin_destroy(:environment))
-    prevent(*create_read_update_admin_destroy(:feature_flags))
     prevent(*create_read_update_admin_destroy(:cluster))
     prevent(*create_read_update_admin_destroy(:deployment))
   end
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index e1346ef857a906..c904798883ce8d 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -196,7 +196,7 @@
 
       - if project_nav_tab? :operations
         = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags]) do
-          = link_to project_environments_path(@project), class: 'shortcuts-operations' do
+          = link_to metrics_project_environments_path(@project), class: 'shortcuts-operations' do
             .nav-icon-container
               = sprite_icon('cloud-gear')
             %span.nav-item-name
@@ -204,7 +204,7 @@
 
           %ul.sidebar-sub-level-items
             = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags], html_options: { class: "fly-out-top-item" } ) do
-              = link_to project_environments_path(@project) do
+              = link_to metrics_project_environments_path(@project) do
                 %strong.fly-out-top-item-name
                   =  _('Operations')
             %li.divider.fly-out-top-item
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 9c7f33f1f1a6d4..d00084ca27688c 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -8,6 +8,7 @@ module ProjectPolicy
       approvers
       vulnerability_feedback
       license_management
+      feature_flag
     ].freeze
 
     prepended do
diff --git a/lib/api/api.rb b/lib/api/api.rb
index de8f96c658e8fe..3bcb8e7cc083f4 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -166,7 +166,7 @@ class API < Grape::API
     ## EE-specific API V4 endpoints START
     mount ::EE::API::Boards
     mount ::EE::API::GroupBoards
-    
+
     mount ::API::Unleash
     mount ::API::EpicIssues
     mount ::API::Epics
-- 
GitLab


From 4643d9447a924e863261a3aeb2e1f50e467d4a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 12:25:58 +0200
Subject: [PATCH 50/57] Fix after code review

---
 db/schema.rb                                    |  2 +-
 ee/app/helpers/feature_flags_helper.rb          |  6 ++++--
 .../_configure_feature_flags_modal.html.haml    |  2 +-
 .../projects/feature_flags/_errors.html.haml    |  4 ++--
 ...80626171125_add_feature_flags_to_projects.rb |  2 +-
 ee/lib/api/unleash.rb                           | 17 +++++++++++------
 .../projects/feature_flags_controller_spec.rb   |  2 +-
 ee/spec/helpers/feature_flags_helper_spec.rb    |  4 ++--
 ee/spec/requests/api/unleash_spec.rb            | 10 +++++-----
 9 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index a2dba21bd9a2ee..34d2cd3c562dc1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1959,7 +1959,7 @@
     t.string "token", null: false
   end
 
-  add_index "operations_feature_flags_clients", ["token"], name: "index_operations_feature_flags_clients_on_token", unique: true, using: :btree
+  add_index "operations_feature_flags_clients", ["project_id", "token"], name: "index_operations_feature_flags_clients_on_project_id_and_token", unique: true, using: :btree
 
   create_table "packages_maven_metadata", id: :bigserial, force: :cascade do |t|
     t.integer "package_id", limit: 8, null: false
diff --git a/ee/app/helpers/feature_flags_helper.rb b/ee/app/helpers/feature_flags_helper.rb
index 8a6f897e9761e1..fa21ecf684fd68 100644
--- a/ee/app/helpers/feature_flags_helper.rb
+++ b/ee/app/helpers/feature_flags_helper.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 module FeatureFlagsHelper
+  include ::API::Helpers::RelatedResourcesHelpers
+
   def unleash_api_url(project)
-    "#{root_url(only_path: false)}api/v4/feature_flags/unleash/#{project.id}"
+    expose_url(api_v4_feature_flags_unleash_path(project_id: project.id))
   end
 
-  def unleash_api_instanceid(project)
+  def unleash_api_instance_id(project)
     project.feature_flags_client_token
   end
 end
diff --git a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index 8ad4f864e4fa2d..8a6947facb4aa6 100644
--- a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -33,7 +33,7 @@
             = label_tag :instance_id, s_('FeatureFlags|Instance ID'), class: 'label-bold'
             .input-group
               = text_field_tag :instance_id,
-                unleash_api_instanceid(@project),
+                unleash_api_instance_id(@project),
                 readonly: true,
                 class: "form-control js-select-on-focus"
               %span.input-group-append
diff --git a/ee/app/views/projects/feature_flags/_errors.html.haml b/ee/app/views/projects/feature_flags/_errors.html.haml
index 8fb4bd22712082..a32245640be2c2 100644
--- a/ee/app/views/projects/feature_flags/_errors.html.haml
+++ b/ee/app/views/projects/feature_flags/_errors.html.haml
@@ -1,4 +1,4 @@
 #error_explanation
   .alert.alert-danger
-    - @feature_flag.errors.full_messages.each do |msg|
-      %p= msg
+    - @feature_flag.errors.full_messages.each do |message|
+      %p= message
diff --git a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 74ce0d5df159a8..0ad4ade4e5a3f5 100644
--- a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -23,7 +23,7 @@ def change
       t.integer :project_id, null: false
       t.string :token, null: false
 
-      t.index :token, unique: true
+      t.index [:project_id, :token], unique: true
 
       t.foreign_key :projects, column: :project_id, on_delete: :cascade
     end
diff --git a/ee/lib/api/unleash.rb b/ee/lib/api/unleash.rb
index e58a4a44b8bb85..b70e3a75738a79 100644
--- a/ee/lib/api/unleash.rb
+++ b/ee/lib/api/unleash.rb
@@ -6,14 +6,19 @@ class Unleash < Grape::API
       resource :unleash, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
         params do
           requires :project_id, type: String, desc: 'The ID of a project'
-          optional :instanceid, type: String, desc: 'The Instance ID of Unleash Client'
+          optional :instance_id, type: String, desc: 'The Instance ID of Unleash Client'
         end
         route_param :project_id do
           before do
-            authorize_by_unleash_instanceid!
+            authorize_by_unleash_instance_id!
             authorize_feature_flags_feature!
           end
 
+          get do
+            # not supported yet
+            status :ok
+          end
+
           get 'features' do
             present project, with: ::EE::API::Entities::UnleashFeatures
           end
@@ -36,13 +41,13 @@ def project
         @project ||= find_project(params[:project_id])
       end
 
-      def unleash_instanceid
-        params[:instanceid] || env['HTTP_UNLEASH_INSTANCEID']
+      def unleash_instance_id
+        params[:instance_id] || env['HTTP_UNLEASH_INSTANCEID']
       end
 
-      def authorize_by_unleash_instanceid!
+      def authorize_by_unleash_instance_id!
         unauthorized! unless Operations::FeatureFlagsClient
-          .find_for_project_and_token(project, unleash_instanceid)
+          .find_for_project_and_token(project, unleash_instance_id)
       end
 
       def authorize_feature_flags_feature!
diff --git a/ee/spec/controllers/projects/feature_flags_controller_spec.rb b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
index a73cc7e46f094d..28296a97a41ad7 100644
--- a/ee/spec/controllers/projects/feature_flags_controller_spec.rb
+++ b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Projects::FeatureFlagsController do
-  include Rails.application.routes.url_helpers
+  include Gitlab::Routing
 
   set(:user) { create(:user) }
   set(:project) { create(:project) }
diff --git a/ee/spec/helpers/feature_flags_helper_spec.rb b/ee/spec/helpers/feature_flags_helper_spec.rb
index ae27613eb04ddf..96a494f762bfbf 100644
--- a/ee/spec/helpers/feature_flags_helper_spec.rb
+++ b/ee/spec/helpers/feature_flags_helper_spec.rb
@@ -9,8 +9,8 @@
     it { is_expected.to end_with("/api/v4/feature_flags/unleash/#{project.id}") }
   end
 
-  context '#unleash_api_instanceid' do
-    subject { helper.unleash_api_instanceid(project) }
+  context '#unleash_api_instance_id' do
+    subject { helper.unleash_api_instance_id(project) }
 
     it { is_expected.not_to be_empty }
   end
diff --git a/ee/spec/requests/api/unleash_spec.rb b/ee/spec/requests/api/unleash_spec.rb
index 89e62e7c961bcb..8c44d72a0fae72 100644
--- a/ee/spec/requests/api/unleash_spec.rb
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -12,9 +12,9 @@
   end
 
   shared_examples 'authenticated request' do
-    context 'when using instanceid' do
+    context 'when using instance id' do
       let(:client) { create(:operations_feature_flags_client, project: project) }
-      let(:params) { { instanceid: client.token } }
+      let(:params) { { instance_id: client.token } }
 
       it 'responds with OK' do
         subject
@@ -44,8 +44,8 @@
       end
     end
 
-    context 'when using bogus instanceid' do
-      let(:params) { { instanceid: 'token' } }
+    context 'when using bogus instance id' do
+      let(:params) { { instance_id: 'token' } }
 
       it 'responds with unauthorized' do
         subject
@@ -56,7 +56,7 @@
 
     context 'when using not existing project' do
       let(:project_id) { -5000 }
-      let(:params) { { instanceid: 'token' } }
+      let(:params) { { instance_id: 'token' } }
 
       it 'responds with unauthorized' do
         subject
-- 
GitLab


From bddd19613b84c32184c23c22f65a790c094c5ebc Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Tue, 2 Oct 2018 16:51:51 +0200
Subject: [PATCH 51/57] Remove remaining TODOs from feature tests

---
 ee/spec/features/projects/feature_flags_spec.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ee/spec/features/projects/feature_flags_spec.rb b/ee/spec/features/projects/feature_flags_spec.rb
index ad66a4ecf8360a..33641f1f26cdc5 100644
--- a/ee/spec/features/projects/feature_flags_spec.rb
+++ b/ee/spec/features/projects/feature_flags_spec.rb
@@ -47,8 +47,7 @@
         it 'displays an error message' do
           add_feature_flag(name, description, false)
 
-          # TODO: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7433#note_104442383
-          # expect(current_path).to eq new_project_feature_flag_path(project)
+          expect(current_path).to eq project_feature_flags_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
@@ -79,8 +78,7 @@
         it 'displays an error message' do
           edit_feature_flag('feature-flag-to-edit', name, description, false)
 
-          # TODO: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7433#note_104442383
-          # expect(current_path).to eq new_project_feature_flag_path(project)
+          expect(current_path).to eq project_feature_flags_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
-- 
GitLab


From ff44e0e9dacc7c2a2373419f1cedecadc62e04f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 17:05:23 +0200
Subject: [PATCH 52/57] Fix all code offences

---
 ee/app/helpers/ee/projects_helper.rb                         | 2 +-
 ee/app/views/projects/feature_flags/new.html.haml            | 1 +
 .../controllers/projects/feature_flags_controller_spec.rb    | 3 +--
 ee/spec/features/projects/feature_flags_spec.rb              | 5 +++--
 ee/spec/lib/gitlab/import_export/all_models.yml              | 2 +-
 ee/spec/requests/api/unleash_spec.rb                         | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ee/app/helpers/ee/projects_helper.rb b/ee/app/helpers/ee/projects_helper.rb
index 20ce463be15688..634f3b7db71f80 100644
--- a/ee/app/helpers/ee/projects_helper.rb
+++ b/ee/app/helpers/ee/projects_helper.rb
@@ -31,7 +31,7 @@ def get_project_nav_tabs(project, current_user)
 
       nav_tabs
     end
-    
+
     override :tab_ability_map
     def tab_ability_map
       tab_ability_map = super
diff --git a/ee/app/views/projects/feature_flags/new.html.haml b/ee/app/views/projects/feature_flags/new.html.haml
index d75d8585c61a2f..7ca3340073db82 100644
--- a/ee/app/views/projects/feature_flags/new.html.haml
+++ b/ee/app/views/projects/feature_flags/new.html.haml
@@ -1,3 +1,4 @@
+- @breadcrumb_link = new_project_feature_flag_path(@project)
 - add_to_breadcrumbs "Feature Flags", project_feature_flags_path(@project)
 - breadcrumb_title s_('FeatureFlags|New')
 - page_title s_('FeatureFlags|New Feature Flag')
diff --git a/ee/spec/controllers/projects/feature_flags_controller_spec.rb b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
index 28296a97a41ad7..8944f83594cd7a 100644
--- a/ee/spec/controllers/projects/feature_flags_controller_spec.rb
+++ b/ee/spec/controllers/projects/feature_flags_controller_spec.rb
@@ -67,7 +67,7 @@
 
     it 'renders the form' do
       subject
-      
+
       expect(response).to be_ok
       expect(response).to render_template('new')
       expect(response).to render_template('_form')
@@ -151,4 +151,3 @@ def view_params
     { namespace_id: project.namespace, project_id: project }
   end
 end
-
diff --git a/ee/spec/features/projects/feature_flags_spec.rb b/ee/spec/features/projects/feature_flags_spec.rb
index 33641f1f26cdc5..10a01cfd4ae68b 100644
--- a/ee/spec/features/projects/feature_flags_spec.rb
+++ b/ee/spec/features/projects/feature_flags_spec.rb
@@ -14,6 +14,7 @@
   let(:project) {create(:project, namespace: user.namespace)}
 
   before do
+    stub_licensed_features(feature_flags: true)
     sign_in(user)
   end
 
@@ -47,7 +48,7 @@
         it 'displays an error message' do
           add_feature_flag(name, description, false)
 
-          expect(current_path).to eq project_feature_flags_path(project)
+          expect(current_path).to eq project_feature_flag_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
@@ -78,7 +79,7 @@
         it 'displays an error message' do
           edit_feature_flag('feature-flag-to-edit', name, description, false)
 
-          expect(current_path).to eq project_feature_flags_path(project)
+          expect(current_path).to eq project_feature_flag_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
diff --git a/ee/spec/lib/gitlab/import_export/all_models.yml b/ee/spec/lib/gitlab/import_export/all_models.yml
index 520d9c149ede0d..70f1b13db4bb43 100644
--- a/ee/spec/lib/gitlab/import_export/all_models.yml
+++ b/ee/spec/lib/gitlab/import_export/all_models.yml
@@ -57,7 +57,7 @@ project:
 - vulnerability_identifiers
 - vulnerability_scanners
 - operations_feature_flags
-- operations_feature_flags_instance
+- operations_feature_flags_client
 - prometheus_alerts
 - prometheus_alert_events
 - software_license_policies
diff --git a/ee/spec/requests/api/unleash_spec.rb b/ee/spec/requests/api/unleash_spec.rb
index 8c44d72a0fae72..75b68d24debd3c 100644
--- a/ee/spec/requests/api/unleash_spec.rb
+++ b/ee/spec/requests/api/unleash_spec.rb
@@ -88,7 +88,7 @@
 
       it 'matches json schema' do
         subject
-        
+
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to match_response_schema('unleash/unleash', dir: 'ee')
       end
-- 
GitLab


From 8334488145efdf14eee13b2a5d555cd4f97a6263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 2 Oct 2018 19:04:42 +0200
Subject: [PATCH 53/57] Fix final spec failure

---
 ee/spec/features/projects/feature_flags_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ee/spec/features/projects/feature_flags_spec.rb b/ee/spec/features/projects/feature_flags_spec.rb
index 10a01cfd4ae68b..f261a0bf819e73 100644
--- a/ee/spec/features/projects/feature_flags_spec.rb
+++ b/ee/spec/features/projects/feature_flags_spec.rb
@@ -48,7 +48,6 @@
         it 'displays an error message' do
           add_feature_flag(name, description, false)
 
-          expect(current_path).to eq project_feature_flag_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
@@ -79,7 +78,6 @@
         it 'displays an error message' do
           edit_feature_flag('feature-flag-to-edit', name, description, false)
 
-          expect(current_path).to eq project_feature_flag_path(project)
           expect(page).to have_selector '.alert-danger', text: error_message
         end
       end
-- 
GitLab


From db980f92a6425b1cd202e1759e52bb5b251fbb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 3 Oct 2018 08:28:18 +0200
Subject: [PATCH 54/57] Make modal title to be h4

---
 .../feature_flags/_configure_feature_flags_modal.html.haml      | 2 +-
 .../projects/feature_flags/_delete_feature_flag_modal.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
index 8a6947facb4aa6..0ba79fc8e56e1b 100644
--- a/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
+++ b/ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml
@@ -4,7 +4,7 @@
     .modal-dialog{ role: 'document' }
       .modal-content
         .modal-header
-          %h5.modal-title
+          %h4.modal-title
             = s_('FeatureFlags|Configure feature flags')
           %button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: _('Close') } }
             %span{ "aria-hidden": true } &times;
diff --git a/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml b/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
index d94e917befeb3a..5920570d52a456 100644
--- a/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
+++ b/ee/app/views/projects/feature_flags/_delete_feature_flag_modal.html.haml
@@ -5,7 +5,7 @@
     .modal-dialog{ role: 'document' }
       .modal-content
         .modal-header
-          %h5.modal-title.d-flex.mw-100
+          %h4.modal-title.d-flex.mw-100
             - truncated_feature_flag_name = capture do
               %span.text-truncate.prepend-left-4.append-right-4= feature_flag.name
             = s_('FeatureFlags|Delete %{feature_flag_name}?').html_safe % { feature_flag_name: truncated_feature_flag_name }
-- 
GitLab


From 1de433a584edfa3ab16b632afb92c081db92f52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 4 Oct 2018 10:49:16 +0200
Subject: [PATCH 55/57] Re-order feature flags table

---
 db/schema.rb                                                  | 2 +-
 ee/changelogs/unreleased/feature-flags-mvc-ee.yml             | 2 +-
 ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 34d2cd3c562dc1..b4ca69f5448279 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1945,9 +1945,9 @@
 
   create_table "operations_feature_flags", id: :bigserial, force: :cascade do |t|
     t.integer "project_id", null: false
+    t.boolean "active", null: false
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
-    t.boolean "active", null: false
     t.string "name", null: false
     t.text "description"
   end
diff --git a/ee/changelogs/unreleased/feature-flags-mvc-ee.yml b/ee/changelogs/unreleased/feature-flags-mvc-ee.yml
index 8a7994e1165118..9e675bf50d41c4 100644
--- a/ee/changelogs/unreleased/feature-flags-mvc-ee.yml
+++ b/ee/changelogs/unreleased/feature-flags-mvc-ee.yml
@@ -1,5 +1,5 @@
 ---
 title: Add Feature Flags MVC
-merge_request:
+merge_request: 7433
 author:
 type: added
diff --git a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
index 0ad4ade4e5a3f5..c2ade6cc413117 100644
--- a/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
+++ b/ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb
@@ -7,10 +7,11 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   def change
     create_table :operations_feature_flags, id: :bigserial do |t|
       t.integer :project_id, null: false
+      t.boolean :active, null: false
+
       t.datetime_with_timezone :created_at, null: false
       t.datetime_with_timezone :updated_at, null: false
 
-      t.boolean :active, null: false
       t.string :name, null: false
       t.text :description
 
-- 
GitLab


From d1a15cf13be4b5a4f30c7ea52040be6f638362c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 4 Oct 2018 11:01:39 +0200
Subject: [PATCH 56/57] Fix yarn.lock

---
 yarn.lock | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index daf00af00610f8..3b178bfc1466f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -184,12 +184,16 @@
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.30.0.tgz#72dca2fb67bafb3c975a322dc6406aaa29aed86c"
 
+"@gitlab-org/gitlab-svgs@^1.30.0":
+  version "1.31.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.31.0.tgz#495b074669f93af40e34f9978ce887773dea470a"
+
 "@gitlab-org/gitlab-ui@^1.7.1":
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.7.1.tgz#e9cce86cb7e34311405e705c1de674276b453f17"
   integrity sha512-X12W39lFnWmfmYcHBokrauKvp6VLW9u0rFdgBXWlnrRL2hBShnyeBsBXKLMGUGnofMtgYv3iYO/rFW9IB79lFg==
   dependencies:
-    "@gitlab-org/gitlab-svgs" "^1.30.0"
+    "@gitlab-org/gitlab-svgs" "^1.23.0"
     bootstrap-vue "^2.0.0-rc.11"
     vue "^2.5.16"
 
-- 
GitLab


From 3f58a218cad8ea82c6c511e8a07ea0ddd1b763fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 4 Oct 2018 11:46:45 +0200
Subject: [PATCH 57/57] Fix static-analysis

---
 app/assets/stylesheets/framework/modal.scss | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index b157f8c4568608..7e30747963a592 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -30,17 +30,6 @@
     }
   }
 
-  // leave enough space for the close icon
-  .modal-title {
-    &.mw-100,
-    &.w-100 {
-      // after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here
-      // https://github.com/twbs/bootstrap/pull/26976
-      margin-right: -2rem;
-      padding-right: 2rem;
-    }
-  }
-
   .page-title {
     margin-top: 0;
   }
-- 
GitLab