CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
+## 9.2.2 (2017-05-25)
+
+- No changes.
+
 ## 9.2.1 (2017-05-23)
 - No changes.

CHANGELOG.md

@@ -2,6 +2,11 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 9.2.2 (2017-05-25)
+
+- Fix issue where real time pipelines were not cached. !11615
+- Make all notes use equal padding.
+
 ## 9.2.1 (2017-05-23)
 - Fix placement of note emoji on hover.

app/assets/javascripts/filtered_search/filtered_search_bundle.js

@@ -10,4 +10,4 @@ import './filtered_search_tokenizer';
 import './filtered_search_visual_tokens';
 // EE-only
-import './filtered_search_token_keys_with_weights';
+import './filtered_search_token_keys_issues_ee';

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

@@ -11,7 +11,7 @@ class FilteredSearchDropdownManager {
     this.page = page;
     if (this.page === 'issues' || this.page === 'boards') {
-      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
+      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysIssuesEE;
     }
     this.setupMapping();

app/assets/javascripts/filtered_search/filtered_search_manager.js

@@ -14,7 +14,7 @@ class FilteredSearchManager {
     this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
     if (page === 'issues' || page === 'boards') {
-      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysWithWeights;
+      this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysIssuesEE;
     }
     this.recentSearchesStore = new RecentSearchesStore({

app/assets/javascripts/filtered_search/filtered_search_token_keys_with_weights.js → app/assets/javascripts/filtered_search/filtered_search_token_keys_issues_ee.js

@@ -18,15 +18,20 @@ const weightConditions = [{
   value: 'any',
 }];
-class FilteredSearchTokenKeysWithWeights extends gl.FilteredSearchTokenKeys {
+class FilteredSearchTokenKeysIssuesEE extends gl.FilteredSearchTokenKeys {
   static get() {
     const tokenKeys = Array.from(super.get());
+
+    // Enable multiple assignees
+    const assigneeTokenKey = tokenKeys.find(tk => tk.key === 'assignee');
+    assigneeTokenKey.type = 'array';
+
     tokenKeys.push(weightTokenKey);
     return tokenKeys;
   }
   static getKeys() {
-    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    const tokenKeys = FilteredSearchTokenKeysIssuesEE.get();
     return tokenKeys.map(i => i.key);
   }
@@ -40,18 +45,18 @@ class FilteredSearchTokenKeysWithWeights extends gl.FilteredSearchTokenKeys {
   }
   static searchByKey(key) {
-    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    const tokenKeys = FilteredSearchTokenKeysIssuesEE.get();
     return tokenKeys.find(tokenKey => tokenKey.key === key) || null;
   }
   static searchBySymbol(symbol) {
-    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
+    const tokenKeys = FilteredSearchTokenKeysIssuesEE.get();
     return tokenKeys.find(tokenKey => tokenKey.symbol === symbol) || null;
   }
   static searchByKeyParam(keyParam) {
-    const tokenKeys = FilteredSearchTokenKeysWithWeights.get();
-    const alternativeTokenKeys = FilteredSearchTokenKeysWithWeights.getAlternatives();
+    const tokenKeys = FilteredSearchTokenKeysIssuesEE.get();
+    const alternativeTokenKeys = FilteredSearchTokenKeysIssuesEE.getAlternatives();
     const tokenKeysWithAlternative = tokenKeys.concat(alternativeTokenKeys);
     return tokenKeysWithAlternative.find((tokenKey) => {
@@ -66,16 +71,16 @@ class FilteredSearchTokenKeysWithWeights extends gl.FilteredSearchTokenKeys {
   }
   static searchByConditionUrl(url) {
-    const conditions = FilteredSearchTokenKeysWithWeights.getConditions();
+    const conditions = FilteredSearchTokenKeysIssuesEE.getConditions();
     return conditions.find(condition => condition.url === url) || null;
   }
   static searchByConditionKeyValue(key, value) {
-    const conditions = FilteredSearchTokenKeysWithWeights.getConditions();
+    const conditions = FilteredSearchTokenKeysIssuesEE.getConditions();
     return conditions
       .find(condition => condition.tokenKey === key && condition.value === value) || null;
   }
 }
 window.gl = window.gl || {};
-gl.FilteredSearchTokenKeysWithWeights = FilteredSearchTokenKeysWithWeights;
+gl.FilteredSearchTokenKeysIssuesEE = FilteredSearchTokenKeysIssuesEE;

app/assets/stylesheets/framework/variables.scss

@@ -573,3 +573,12 @@ $filter-value-selected-color: #d7d7d7;
 Animation Functions
 */
 $dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1);
+
+/*
+GitLab Plans
+*/
+
+$gl-gold-plan: #d4af37;
+$gl-silver-plan: #91a1ab;
+$gl-bronze-plan: #cd7f32;
+$gl-no-plan: $gl-gray-light;

app/assets/stylesheets/pages/groups.scss

@@ -159,3 +159,38 @@ table.pipeline-project-metrics tr td {
     height: 50px;
   }
 }
+
+.plan-badge {
+  margin-right: 15px;
+
+  svg {
+    position: relative;
+    top: 3px;
+    height: 16px;
+    width: 16px;
+  }
+
+  &.inline {
+    display: inline-block;
+    margin: 0 4px;
+  }
+
+  &[data-plan="gold"] {
+    color: darken($gl-gold-plan, 20%);
+    svg g { fill: $gl-gold-plan; }
+  }
+
+  &[data-plan="silver"] {
+    color: darken($gl-silver-plan, 20%);
+    svg g { fill: $gl-silver-plan; }
+  }
+
+  &[data-plan="bronze"] {
+    color: darken($gl-bronze-plan, 20%);
+    svg g { fill: $gl-bronze-plan; }
+  }
+
+  &:not([data-plan]) {
+    svg g { fill: $gl-no-plan; }
+  }
+}

app/models/merge_request.rb

@@ -490,6 +490,7 @@ def wip_title
   end
   def mergeable?(skip_ci_check: false)
+    return false unless approved?
     return false unless mergeable_state?(skip_ci_check: skip_ci_check)
     check_if_can_be_merged

app/views/admin/_namespace_plan_badge.html.haml

+- namespace = local_assigns[:namespace]
+- if current_application_settings.should_check_namespace_plan? && namespace && namespace.plan.present?
+  %span.plan-badge.has-tooltip{ data: { plan: namespace.plan }, title: "#{namespace.plan.titleize} Plan" }
+    = custom_icon('icon_premium')

app/views/admin/_namespace_plan_info.html.haml

+- namespace = local_assigns[:namespace]
+- if current_application_settings.should_check_namespace_plan? && namespace
+  %li
+    %span.light Plan:
+    - if namespace.plan.present?
+      %strong.plan-badge.inline{ data: { plan: namespace.plan } }
+        = custom_icon('icon_premium')
+        = namespace.plan.titleize
+    - else
+      %strong.plan-badge.inline
+        = custom_icon('icon_premium')
+        No Plan

app/views/admin/groups/_group.html.haml

@@ -8,6 +8,8 @@
     %span.badge
       = storage_counter(group.storage_size)
+    = render 'admin/namespace_plan_badge', namespace: group
+
     %span
       = icon('bookmark')
       = number_with_delimiter(group.projects.count)

app/views/admin/groups/show.html.haml

@@ -38,6 +38,8 @@
           %strong
             = @group.created_at.to_s(:medium)
+        = render 'admin/namespace_plan_info', namespace: @group
+
         %li
           %span.light Storage:
           %strong= storage_counter(@group.storage_size)

app/views/admin/users/_form.html.haml

@@ -42,6 +42,12 @@
     = render partial: 'access_levels', locals: { f: f }
+    - if current_application_settings.should_check_namespace_plan?
+      = f.fields_for :namespace do |namespace_form|
+        %fieldset
+          %legend Licensed Features
+          = render 'admin/namespace_plan', f: namespace_form
+
     = render partial: 'limits', locals: { f: f }
     %fieldset
@@ -70,12 +76,6 @@
         = f.label :note, 'Note', class: 'control-label'
         .col-sm-10= f.text_area :note, class: 'form-control'
-    - if current_application_settings.should_check_namespace_plan?
-      = f.fields_for :namespace do |namespace_form|
-        %fieldset
-          %legend Plan
-          = render 'admin/namespace_plan', f: namespace_form
-
     .form-actions
       - if @user.new_record?
         = f.submit 'Create user', class: "btn btn-create"

app/views/admin/users/_user.html.haml

@@ -18,6 +18,9 @@
     .row-second-line.str-truncated-100
       = mail_to user.email, user.email
   .controls
+
+    = render 'admin/namespace_plan_badge', namespace: user.namespace
+
     = link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: 'btn'
     - unless user == current_user
       .dropdown.inline

app/views/admin/users/show.html.haml

@@ -47,6 +47,8 @@
             - else
               Disabled
+        = render 'admin/namespace_plan_info', namespace: @user.namespace
+
         %li
           %span.light External User:
           %strong

app/views/shared/icons/_icon_premium.svg

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="#262626" fill-rule="evenodd"><path d="m8 10c-2.761 0-5-2.239-5-5 0-2.761 2.239-5 5-5 2.761 0 5 2.239 5 5 0 2.761-2.239 5-5 5m0-2.5c1.381 0 2.5-1.119 2.5-2.5 0-1.381-1.119-2.5-2.5-2.5-1.381 0-2.5 1.119-2.5 2.5 0 1.381 1.119 2.5 2.5 2.5m0-1c-.828 0-1.5-.672-1.5-1.5 0-.828.672-1.5 1.5-1.5.828 0 1.5.672 1.5 1.5 0 .828-.672 1.5-1.5 1.5m4.893 1.974l2.321 4.02c.138.239.028.447-.245.463l-1.737.104-.959 1.452c-.151.229-.389.214-.524-.019l-2.143-3.712c1.344-.373 2.498-1.201 3.286-2.308m-6.444 2.324l-2.135 3.697c-.135.234-.373.248-.524.019l-.959-1.452-1.737-.104c-.273-.016-.383-.224-.245-.463l2.293-3.971c.798 1.098 1.958 1.914 3.306 2.274" transform="translate(0 1)"/></g></svg>
\ No newline at end of file

changelogs/unreleased-ee/2052-fix-merge-slash-approvals.yml

+---
+title: Check if a merge request is approved when merging from API or slash command
+merge_request:
+author:

spec/javascripts/filtered_search/filtered_search_token_keys_with_weights_spec.js

 import '~/extensions/array';
-import '~/filtered_search/filtered_search_token_keys_with_weights';
+import '~/filtered_search/filtered_search_token_keys_issues_ee';
 (() => {
-  describe('Filtered Search Token Keys With Weights', () => {
+  describe('Filtered Search Token Keys (Issues EE)', () => {
     const weightTokenKey = {
       key: 'weight',
       type: 'string',
@@ -15,7 +15,7 @@ import '~/filtered_search/filtered_search_token_keys_with_weights';
       let tokenKeys;
       beforeEach(() => {
-        tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
+        tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
       });
       it('should return tokenKeys', () => {
@@ -32,16 +32,21 @@ import '~/filtered_search/filtered_search_token_keys_with_weights';
       });
       it('should always return the same array', () => {
-        const tokenKeys2 = gl.FilteredSearchTokenKeysWithWeights.get();
+        const tokenKeys2 = gl.FilteredSearchTokenKeysIssuesEE.get();
         expect(tokenKeys).toEqual(tokenKeys2);
       });
+
+      it('should return assignee as an array', () => {
+        const assignee = tokenKeys.find(tokenKey => tokenKey.key === 'assignee');
+        expect(assignee.type).toEqual('array');
+      });
     });
     describe('getKeys', () => {
       it('should return keys', () => {
-        const getKeys = gl.FilteredSearchTokenKeysWithWeights.getKeys();
-        const keys = gl.FilteredSearchTokenKeysWithWeights.get().map(i => i.key);
+        const getKeys = gl.FilteredSearchTokenKeysIssuesEE.getKeys();
+        const keys = gl.FilteredSearchTokenKeysIssuesEE.get().map(i => i.key);
         keys.forEach((key, i) => {
           expect(key).toEqual(getKeys[i]);
@@ -53,7 +58,7 @@ import '~/filtered_search/filtered_search_token_keys_with_weights';
       let conditions;
       beforeEach(() => {
-        conditions = gl.FilteredSearchTokenKeysWithWeights.getConditions();
+        conditions = gl.FilteredSearchTokenKeysIssuesEE.getConditions();
       });
       it('should return conditions', () => {
@@ -72,89 +77,89 @@ import '~/filtered_search/filtered_search_token_keys_with_weights';
     describe('searchByKey', () => {
       it('should return null when key not found', () => {
-        const tokenKey = gl.FilteredSearchTokenKeysWithWeights.searchByKey('notakey');
+        const tokenKey = gl.FilteredSearchTokenKeysIssuesEE.searchByKey('notakey');
         expect(tokenKey === null).toBe(true);
       });
       it('should return tokenKey when found by key', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
-        const result = gl.FilteredSearchTokenKeysWithWeights.searchByKey(tokenKeys[0].key);
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
+        const result = gl.FilteredSearchTokenKeysIssuesEE.searchByKey(tokenKeys[0].key);
         expect(result).toEqual(tokenKeys[0]);
       });
       it('should return weight tokenKey when found by weight key', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
         const match = tokenKeys.find(tk => tk.key === weightTokenKey.key);
-        const result = gl.FilteredSearchTokenKeysWithWeights.searchByKey(weightTokenKey.key);
+        const result = gl.FilteredSearchTokenKeysIssuesEE.searchByKey(weightTokenKey.key);
         expect(result).toEqual(match);
       });
     });
     describe('searchBySymbol', () => {
       it('should return null when symbol not found', () => {
-        const tokenKey = gl.FilteredSearchTokenKeysWithWeights.searchBySymbol('notasymbol');
+        const tokenKey = gl.FilteredSearchTokenKeysIssuesEE.searchBySymbol('notasymbol');
         expect(tokenKey === null).toBe(true);
       });
       it('should return tokenKey when found by symbol', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
-        const result = gl.FilteredSearchTokenKeysWithWeights.searchBySymbol(tokenKeys[0].symbol);
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
+        const result = gl.FilteredSearchTokenKeysIssuesEE.searchBySymbol(tokenKeys[0].symbol);
         expect(result).toEqual(tokenKeys[0]);
       });
       it('should return weight tokenKey when found by weight symbol', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
         const match = tokenKeys.find(tk => tk.key === weightTokenKey.key);
-        const result = gl.FilteredSearchTokenKeysWithWeights.searchBySymbol(weightTokenKey.symbol);
+        const result = gl.FilteredSearchTokenKeysIssuesEE.searchBySymbol(weightTokenKey.symbol);
         expect(result).toEqual(match);
       });
     });
     describe('searchByKeyParam', () => {
       it('should return null when key param not found', () => {
-        const tokenKey = gl.FilteredSearchTokenKeysWithWeights.searchByKeyParam('notakeyparam');
+        const tokenKey = gl.FilteredSearchTokenKeysIssuesEE.searchByKeyParam('notakeyparam');
         expect(tokenKey === null).toBe(true);
       });
       it('should return tokenKey when found by key param', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
         expect(result).toEqual(tokenKeys[0]);
       });
       it('should return alternative tokenKey when found by key param', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.getAlternatives();
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.getAlternatives();
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
         expect(result).toEqual(tokenKeys[0]);
       });
       it('should return weight tokenKey when found by weight key param', () => {
-        const tokenKeys = gl.FilteredSearchTokenKeysWithWeights.get();
+        const tokenKeys = gl.FilteredSearchTokenKeysIssuesEE.get();
         const match = tokenKeys.find(tk => tk.key === weightTokenKey.key);
-        const result = gl.FilteredSearchTokenKeysWithWeights.searchByKeyParam(weightTokenKey.key);
+        const result = gl.FilteredSearchTokenKeysIssuesEE.searchByKeyParam(weightTokenKey.key);
         expect(result).toEqual(match);
       });
     });
     describe('searchByConditionUrl', () => {
       it('should return null when condition url not found', () => {
-        const condition = gl.FilteredSearchTokenKeysWithWeights.searchByConditionUrl(null);
+        const condition = gl.FilteredSearchTokenKeysIssuesEE.searchByConditionUrl(null);
         expect(condition === null).toBe(true);
       });
       it('should return condition when found by url', () => {
-        const conditions = gl.FilteredSearchTokenKeysWithWeights.getConditions();
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const conditions = gl.FilteredSearchTokenKeysIssuesEE.getConditions();
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByConditionUrl(conditions[0].url);
         expect(result).toBe(conditions[0]);
       });
       it('should return weight condition when found by weight url', () => {
-        const conditions = gl.FilteredSearchTokenKeysWithWeights.getConditions();
+        const conditions = gl.FilteredSearchTokenKeysIssuesEE.getConditions();
         const weightConditions = conditions.filter(c => c.tokenKey === 'weight');
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByConditionUrl(weightConditions[0].url);
         expect(result).toBe(weightConditions[0]);
       });
@@ -162,22 +167,22 @@ import '~/filtered_search/filtered_search_token_keys_with_weights';
     describe('searchByConditionKeyValue', () => {
       it('should return null when condition tokenKey and value not found', () => {
-        const condition = gl.FilteredSearchTokenKeysWithWeights
+        const condition = gl.FilteredSearchTokenKeysIssuesEE
           .searchByConditionKeyValue(null, null);
         expect(condition === null).toBe(true);
       });
       it('should return condition when found by tokenKey and value', () => {
-        const conditions = gl.FilteredSearchTokenKeysWithWeights.getConditions();
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const conditions = gl.FilteredSearchTokenKeysIssuesEE.getConditions();
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByConditionKeyValue(conditions[0].tokenKey, conditions[0].value);
         expect(result).toEqual(conditions[0]);
       });
       it('should return weight condition when found by weight tokenKey and value', () => {
-        const conditions = gl.FilteredSearchTokenKeysWithWeights.getConditions();
+        const conditions = gl.FilteredSearchTokenKeysIssuesEE.getConditions();
         const weightConditions = conditions.filter(c => c.tokenKey === 'weight');
-        const result = gl.FilteredSearchTokenKeysWithWeights
+        const result = gl.FilteredSearchTokenKeysIssuesEE
           .searchByConditionKeyValue(weightConditions[0].tokenKey, weightConditions[0].value);
         expect(result).toEqual(weightConditions[0]);
       });

spec/models/merge_request_spec.rb

@@ -1187,6 +1187,26 @@ def set_compare(merge_request)
       expect(subject.mergeable?).to be_truthy
     end
+
+    context 'when using approvals' do
+      let(:user) { create(:user) }
+      before do
+        allow(subject).to receive(:mergeable_state?).and_return(true)
+
+        subject.target_project.update_attributes(approvals_before_merge: 1)
+        project.team << [user, :developer]
+      end
+
+      it 'return false if not approved' do
+        expect(subject.mergeable?).to be_falsey
+      end
+
+      it 'return true if approved' do
+        subject.approvals.create(user: user)
+
+        expect(subject.mergeable?).to be_truthy
+      end
+    end
   end
   describe '#mergeable_state?' do
@@ -1956,6 +1976,22 @@ def create_pipeline(status)
           expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_truthy
         end
       end
+
+      context 'with approvals' do
+        before do
+          merge_request.target_project.update_attributes(approvals_before_merge: 1)
+        end
+
+        it 'is not mergeable when not approved' do
+          expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_falsey
+        end
+
+        it 'is mergeable when approved' do
+          merge_request.approvals.create(user: user)
+
+          expect(merge_request.mergeable_with_slash_command?(developer, last_diff_sha: mr_sha)).to be_truthy
+        end
+      end
     end
   end