Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/operation_settings/index.js

@@ -3,14 +3,6 @@ import store from './store';
 import ExternalDashboardForm from './components/external_dashboard.vue';
 
 export default () => {
-  /**
-   * This check can be removed when we remove
-   * the :grafana_dashboard_link feature flag
-   */
-  if (!gon.features.grafanaDashboardLink) {
-    return null;
-  }
-
   const el = document.querySelector('.js-operation-settings');
 
   return new Vue({

app/controllers/projects/environments_controller.rb

@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
     push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint)
     push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards)
-    push_frontend_feature_flag(:grafana_dashboard_link)
     push_frontend_feature_flag(:prometheus_computed_alerts)
   end
 

app/controllers/projects/settings/operations_controller.rb

@@ -5,10 +5,6 @@ module Projects
     class OperationsController < Projects::ApplicationController
       before_action :authorize_update_environment!
 
-      before_action do
-        push_frontend_feature_flag(:grafana_dashboard_link)
-      end
-
       helper_method :error_tracking_setting
 
       def show

app/views/projects/_home_panel.html.haml

@@ -64,7 +64,7 @@
 
   .home-panel-home-desc.mt-1
     - if @project.description.present?
-      .home-panel-description
+      .home-panel-description.text-break
         .home-panel-description-markdown.read-more-container
           = markdown_field(@project, :description)
         %button.btn.btn-blank.btn-link.js-read-more-trigger.d-lg-none{ type: "button" }

changelogs/unreleased/62134-fix-non-wraping-project-description.yml

+---
+title: Correctly word-wrapping project descriptions with very long words
+merge_request: 28695
+author: Erik van der Gaag
+type: fixed

changelogs/unreleased/remove-grafana-dashboard-link-feature-flag.yml

+---
+title: Link to an external dashboard from metrics dashboard
+merge_request: 29369
+author:
+type: added

spec/javascripts/monitoring/dashboard_spec.js

@@ -49,9 +49,6 @@ describe('Dashboard', () => {
     window.gon = {
       ...window.gon,
       ee: false,
-      features: {
-        grafanaDashboardLink: true,
-      },
     };
 
     store = createStore();
@@ -382,16 +379,14 @@ describe('Dashboard', () => {
   describe('external dashboard link', () => {
     beforeEach(() => {
       mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
-    });
 
-    describe('with feature flag enabled', () => {
-      beforeEach(() => {
       component = new DashboardComponent({
         el: document.querySelector('.prometheus-graphs'),
         propsData: {
           ...propsData,
           hasMetrics: true,
           showPanels: false,
+          showTimeWindowDropdown: false,
           externalDashboardUrl: '/mockUrl',
         },
         store,
@@ -407,28 +402,4 @@ describe('Dashboard', () => {
       });
     });
   });
-
-    describe('without feature flage enabled', () => {
-      beforeEach(() => {
-        window.gon.features.grafanaDashboardLink = false;
-        component = new DashboardComponent({
-          el: document.querySelector('.prometheus-graphs'),
-          propsData: {
-            ...propsData,
-            hasMetrics: true,
-            showPanels: false,
-            externalDashboardUrl: '',
-          },
-          store,
-        });
-      });
-
-      it('does not show the link', done => {
-        setTimeout(() => {
-          expect(component.$el.querySelector('.js-external-dashboard-link')).toBe(null);
-          done();
-        });
-      });
-    });
-  });
 });