Merge branch '9-1-stable' into 9-1-stable-ee

* 9-1-stable:
  Merge branch 'issuable-state-only-notes-and-description' into 'master'
  Merge branch 'project-group-icon-links' into 'master'
  Merge branch '31137-ensure-yarn-installed' into 'master'
  Merge branch '30985-cancel-pipelines' into 'master'

.gitlab-ci.yml

@@ -264,7 +264,6 @@ rake karma:
   cache:
     paths:
       - vendor/ruby
-      - node_modules
   stage: test
   <<: *use-db
   <<: *dedicated-runner
@@ -365,9 +364,6 @@ coverage:
 lint:javascript:
   <<: *dedicated-runner
-  cache:
-    paths:
-      - node_modules/
   stage: test
   before_script: []
   script:
@@ -375,9 +371,6 @@ lint:javascript:
 lint:javascript:report:
   <<: *dedicated-runner
-  cache:
-    paths:
-      - node_modules/
   stage: post-test
   before_script: []
   script:

app/assets/javascripts/environments/components/environment_actions.js

@@ -36,6 +36,8 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
+      $(this.$refs.tooltip).tooltip('destroy');
+
       this.service.postAction(endpoint)
       .then(() => {
         this.isLoading = false;
@@ -63,6 +65,7 @@ export default {
         class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
         data-container="body"
         data-toggle="dropdown"
+        ref="tooltip"
         :title="title"
         :aria-label="title"
         :disabled="isLoading">

app/assets/javascripts/environments/components/environment_rollback.js

@@ -37,6 +37,8 @@ export default {
     onClick() {
       this.isLoading = true;
+      $(this.$el).tooltip('destroy');
+
       this.service.postAction(this.retryUrl)
       .then(() => {
         this.isLoading = false;

app/assets/javascripts/environments/components/environment_stop.js

@@ -37,6 +37,8 @@ export default {
       if (confirm('Are you sure you want to stop this environment?')) {
         this.isLoading = true;
+        $(this.$el).tooltip('destroy');
+
         this.service.postAction(this.retryUrl)
         .then(() => {
           this.isLoading = false;

app/assets/javascripts/vue_pipelines_index/components/async_button.js

@@ -64,6 +64,8 @@ export default {
     makeRequest() {
       this.isLoading = true;
+      $(this.$el).tooltip('destroy');
+
       this.service.postAction(this.endpoint)
       .then(() => {
         this.isLoading = false;

app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js

@@ -28,6 +28,8 @@ export default {
     onClickAction(endpoint) {
       this.isLoading = true;
+      $(this.$refs.tooltip).tooltip('destroy');
+
       this.service.postAction(endpoint)
       .then(() => {
         this.isLoading = false;
@@ -57,6 +59,7 @@ export default {
         data-toggle="dropdown"
         data-placement="top"
         aria-label="Manual job"
+        ref="tooltip"
         :disabled="isLoading">
         ${playIconSvg}
         <i

app/assets/stylesheets/pages/projects.scss

@@ -604,6 +604,10 @@ pre.light-well {
   .avatar-container {
     align-self: flex-start;
+
+    > a {
+      width: 100%;
+    }
   }
   .project-details {

app/models/concerns/issuable.rb

@@ -23,7 +23,7 @@ module Issuable
   included do
     cache_markdown_field :title, pipeline: :single_line
-    cache_markdown_field :description
+    cache_markdown_field :description, issuable_state_filter_enabled: true
     belongs_to :author, class_name: "User"
     belongs_to :assignee, class_name: "User"

app/models/note.rb

@@ -17,7 +17,7 @@ class Note < ActiveRecord::Base
   ignore_column :original_discussion_id
-  cache_markdown_field :note, pipeline: :note
+  cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true
   # Attribute containing rendered and redacted Markdown as generated by
   # Banzai::ObjectRenderer.

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

@@ -27,7 +27,8 @@
       = visibility_level_icon(group.visibility_level, fw: false)
   .avatar-container.s40
-    = image_tag group_icon(group), class: "avatar s40 hidden-xs"
+    = link_to group do
+      = image_tag group_icon(group), class: "avatar s40 hidden-xs"
   .title
     = link_to group_name, group, class: 'group-name'

app/views/shared/projects/_project.html.haml

@@ -12,10 +12,11 @@
   = cache(cache_key) do
     - if avatar
       .avatar-container.s40
-        - if use_creator_avatar
-          = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
-        - else
-          = project_icon(project, alt: '', class: 'avatar project-avatar s40')
+        = link_to project_path(project), class: dom_class(project) do
+          - if use_creator_avatar
+            = image_tag avatar_icon(project.creator.email, 40), class: "avatar s40", alt:''
+          - else
+            = project_icon(project, alt: '', class: 'avatar project-avatar s40')
     .project-details
       %h3.prepend-top-0.append-bottom-0
         = link_to project_path(project), class: dom_class(project) do

lib/banzai/filter/issuable_state_filter.rb

@@ -9,6 +9,8 @@ module Banzai
       VISIBLE_STATES = %w(closed merged).freeze
       def call
+        return doc unless context[:issuable_state_filter_enabled]
+
         extractor = Banzai::IssuableExtractor.new(project, current_user)
         issuables = extractor.extract([doc])

spec/lib/banzai/filter/issuable_state_filter_spec.rb

@@ -5,6 +5,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
   include FilterSpecHelper
   let(:user) { create(:user) }
+  let(:context) { { current_user: user, issuable_state_filter_enabled: true } }
   def create_link(text, data)
     link_to(text, '', class: 'gfm has-tooltip', data: data)
@@ -20,7 +21,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
   it 'ignores non-issuable links' do
     project = create(:empty_project, :public)
     link = create_link('text', project: project, reference_type: 'issue')
-    doc = filter(link, current_user: user)
+    doc = filter(link, context)
     expect(doc.css('a').last.text).to eq('text')
   end
@@ -28,7 +29,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
   it 'ignores issuable links with empty content' do
     issue = create(:issue, :closed)
     link = create_link('', issue: issue.id, reference_type: 'issue')
-    doc = filter(link, current_user: user)
+    doc = filter(link, context)
     expect(doc.css('a').last.text).to eq('')
   end
@@ -40,17 +41,26 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
       issue: issue.id,
       reference_type: 'issue'
     )
-    doc = filter(link, current_user: user)
+    doc = filter(link, context)
     expect(doc.css('a').last.inner_html).
       to eq('something <strong>else</strong> [closed]')
   end
+  it 'does not append state when filter is not enabled' do
+    issue = create(:issue, :closed)
+    link = create_link('text', issue: issue.id, reference_type: 'issue')
+    context = { current_user: user }
+    doc = filter(link, context)
+
+    expect(doc.css('a').last.text).to eq('text')
+  end
+
   context 'for issue references' do
     it 'ignores open issue references' do
       issue = create(:issue)
       link = create_link('text', issue: issue.id, reference_type: 'issue')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text')
     end
@@ -58,7 +68,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'ignores reopened issue references' do
       reopened_issue = create(:issue, :reopened)
       link = create_link('text', issue: reopened_issue.id, reference_type: 'issue')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text')
     end
@@ -66,7 +76,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'appends [closed] to closed issue references' do
       closed_issue = create(:issue, :closed)
       link = create_link('text', issue: closed_issue.id, reference_type: 'issue')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text [closed]')
     end
@@ -76,7 +86,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'ignores open merge request references' do
       mr = create(:merge_request)
       link = create_link('text', merge_request: mr.id, reference_type: 'merge_request')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text')
     end
@@ -84,7 +94,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'ignores reopened merge request references' do
       mr = create(:merge_request, :reopened)
       link = create_link('text', merge_request: mr.id, reference_type: 'merge_request')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text')
     end
@@ -92,7 +102,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'ignores locked merge request references' do
       mr = create(:merge_request, :locked)
       link = create_link('text', merge_request: mr.id, reference_type: 'merge_request')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text')
     end
@@ -100,7 +110,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'appends [closed] to closed merge request references' do
       mr = create(:merge_request, :closed)
       link = create_link('text', merge_request: mr.id, reference_type: 'merge_request')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text [closed]')
     end
@@ -108,7 +118,7 @@ describe Banzai::Filter::IssuableStateFilter, lib: true do
     it 'appends [merged] to merged merge request references' do
       mr = create(:merge_request, :merged)
       link = create_link('text', merge_request: mr.id, reference_type: 'merge_request')
-      doc = filter(link, current_user: user)
+      doc = filter(link, context)
       expect(doc.css('a').last.text).to eq('text [merged]')
     end