Merge branch 'ce-to-ee-2018-10-26' into 'master'

CE upstream - 2018-10-26 08:21 UTC

See merge request gitlab-org/gitlab-ee!8096

app/assets/javascripts/jobs/components/sidebar.vue

@@ -31,7 +31,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(['job', 'stages', 'jobs', 'selectedStage']),
+    ...mapState(['job', 'stages', 'jobs', 'selectedStage', 'isLoadingStages']),
     coverage() {
       return `${this.job.coverage}%`;
     },
@@ -270,6 +270,7 @@ export default {
         />
 
         <stages-dropdown
+          v-if="!isLoadingStages"
           :stages="stages"
           :pipeline="job.pipeline"
           :selected-stage="selectedStage"

app/assets/javascripts/jobs/components/stages_dropdown.vue

@@ -22,7 +22,6 @@ export default {
       required: true,
     },
   },
-
   computed: {
     hasRef() {
       return !_.isEmpty(this.pipeline.ref);

app/assets/javascripts/jobs/store/mutations.js

@@ -71,7 +71,7 @@ export default {
      * after the first request,
      * and we do not want to hijack that
      */
-    if (state.selectedStage === 'More' && job.stage) {
+    if (state.selectedStage === '' && job.stage) {
       state.selectedStage = job.stage;
     }
   },

app/assets/javascripts/jobs/store/state.js

-import { __ } from '~/locale';
-
 export default () => ({
   jobEndpoint: null,
   traceEndpoint: null,
@@ -29,7 +27,7 @@ export default () => ({
   // sidebar dropdown & list of jobs
   isLoadingStages: false,
   isLoadingJobs: false,
-  selectedStage: __('More'),
+  selectedStage: '',
   stages: [],
   jobs: [],
 });

app/assets/javascripts/lib/utils/text_markdown.js

@@ -2,6 +2,8 @@
 import $ from 'jquery';
 import { insertText } from '~/lib/utils/common_utils';
 
+const LINK_TAG_PATTERN = '[{text}](url)';
+
 function selectedText(text, textarea) {
   return text.substring(textarea.selectionStart, textarea.selectionEnd);
 }
@@ -76,6 +78,21 @@ export function insertMarkdownText({ textArea, text, tag, blockTag, selected, wr
   removedFirstNewLine = false;
   currentLineEmpty = false;
 
+  // check for link pattern and selected text is an URL
+  // if so fill in the url part instead of the text part of the pattern.
+  if (tag === LINK_TAG_PATTERN) {
+    if (URL) {
+      try {
+        const ignoredUrl = new URL(selected);
+        // valid url
+        tag = '[text]({text})';
+        select = 'text';
+      } catch (e) {
+        // ignore - no valid url
+      }
+    }
+  }
+
   // Remove the first newline
   if (selected.indexOf('\n') === 0) {
     removedFirstNewLine = true;

app/assets/stylesheets/framework/typography.scss

@@ -34,7 +34,7 @@
     margin-bottom: 0;
   }
 
-  *:first-child:not(.katex-display) {
+  *:first-child {
     margin-top: 0;
   }
 

app/models/commit_status.rb

@@ -111,7 +111,7 @@ class CommitStatus < ActiveRecord::Base
 
     before_transition any => :failed do |commit_status, transition|
       failure_reason = transition.args.first
-      commit_status.failure_reason = failure_reason
+      commit_status.failure_reason = CommitStatus.failure_reasons[failure_reason]
     end
 
     after_transition do |commit_status, transition|

app/views/shared/notifications/_button.html.haml

@@ -9,11 +9,11 @@
             %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
               = icon("bell", class: "js-notification-loading")
               = notification_title(notification_setting.level)
-            %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
+            %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               = icon('caret-down')
               .sr-only Toggle dropdown
           - else
-            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } }
+            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               = icon("bell", class: "js-notification-loading")
               = notification_title(notification_setting.level)
               = icon("caret-down")

changelogs/unreleased/51306-fix-inaccessible-dropdown-for-codeless-projects.yml

+---
+title: Fix inaccessible dropdown for code-less projects
+merge_request: 22137
+author:
+type: other

changelogs/unreleased/52115-Link-button-in-markdown-editor-should-recognize-URLs.yml

+---
+title: Link button in markdown editor recognize URLs
+merge_request: 1983
+author: Johann Hubert Sonntagbauer
+type: changed

changelogs/unreleased/53133-jobs-list.yml

+---
+title: Fix stage dropdown not rendering in different languages
+merge_request: 22604
+author:
+type: other

changelogs/unreleased/avoid-lock-when-introduce-new-failure-reason.yml

+---
+title: Support backward compatibility when introduce new failure reason
+merge_request: 22566
+author:
+type: changed

lib/api/runner.rb

@@ -142,8 +142,7 @@ module API
         requires :id, type: Integer, desc: %q(Job's ID)
         optional :trace, type: String, desc: %q(Job's full trace)
         optional :state, type: String, desc: %q(Job's status: success, failed)
-        optional :failure_reason, type: String, values: CommitStatus.failure_reasons.keys,
-                                  desc: %q(Job's failure_reason)
+        optional :failure_reason, type: String, desc: %q(Job's failure_reason)
       end
       put '/:id' do
         job = authenticate_job!

spec/javascripts/jobs/components/sidebar_spec.js

@@ -140,10 +140,11 @@ describe('Sidebar details block', () => {
     });
 
     describe('while fetching stages', () => {
-      it('renders dropdown with More label', () => {
+      it('it does not render dropdown', () => {
+        store.dispatch('requestStages');
         vm = mountComponentWithStore(SidebarComponent, { store });
 
-        expect(vm.$el.querySelector('.js-selected-stage').textContent.trim()).toEqual('More');
+        expect(vm.$el.querySelector('.js-selected-stage')).toBeNull();
       });
     });
 

spec/javascripts/jobs/store/mutations_spec.js

@@ -124,8 +124,8 @@ describe('Jobs Store Mutations', () => {
       expect(stateCopy.job).toEqual({ id: 1312321 });
     });
 
-    it('sets selectedStage when the selectedStage is More', () => {
-      expect(stateCopy.selectedStage).toEqual('More');
+    it('sets selectedStage when the selectedStage is empty', () => {
+      expect(stateCopy.selectedStage).toEqual('');
       mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321, stage: 'deploy' });
 
       expect(stateCopy.selectedStage).toEqual('deploy');

spec/javascripts/lib/utils/text_markdown_spec.js

@@ -166,6 +166,33 @@ describe('init markdown', () => {
         expect(textArea.selectionStart).toEqual(expectedText.lastIndexOf(select));
         expect(textArea.selectionEnd).toEqual(expectedText.lastIndexOf(select) + select.length);
       });
+
+      it('should support selected urls', () => {
+        const expectedUrl = 'http://www.gitlab.com';
+        const expectedSelectionText = 'text';
+        const expectedText = `text [${expectedSelectionText}](${expectedUrl}) text`;
+        const initialValue = `text ${expectedUrl} text`;
+
+        textArea.value = initialValue;
+        const selectedIndex = initialValue.indexOf(expectedUrl);
+        textArea.setSelectionRange(selectedIndex, selectedIndex + expectedUrl.length);
+
+        insertMarkdownText({
+          textArea,
+          text: textArea.value,
+          tag,
+          blockTag: null,
+          selected: expectedUrl,
+          wrap: false,
+          select,
+        });
+
+        expect(textArea.value).toEqual(expectedText);
+        expect(textArea.selectionStart).toEqual(expectedText.indexOf(expectedSelectionText, 1));
+        expect(textArea.selectionEnd).toEqual(
+          expectedText.indexOf(expectedSelectionText, 1) + expectedSelectionText.length,
+        );
+      });
     });
   });
 });

spec/requests/api/runner_spec.rb

@@ -802,6 +802,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
           it { expect(job).to be_runner_system_failure }
         end
+
+        context 'when failure_reason is unrecognized value' do
+          before do
+            update_job(state: 'failed', failure_reason: 'what_is_this')
+            job.reload
+          end
+
+          it { expect(job).to be_unknown_failure }
+        end
       end
 
       context 'when trace is given' do