Merge branch '11-4-stable-patch-5' into 11-4-stable

15 files changed, 44 insertions, 28 deletions

diff --git a/app/assets/javascripts/jobs/components/jobs_container.vue b/app/assets/javascripts/jobs/components/jobs_container.vue
index 271b7790d75..6bae7de9f5b 100644
--- a/app/assets/javascripts/jobs/components/jobs_container.vue
+++ b/app/assets/javascripts/jobs/components/jobs_container.vue
@@ -1,5 +1,4 @@
 <script>
-  import _ from 'underscore';
   import CiIcon from '~/vue_shared/components/ci_icon.vue';
   import Icon from '~/vue_shared/components/icon.vue';
   import tooltip from '~/vue_shared/directives/tooltip';
@@ -27,7 +26,7 @@
         return this.jobId === currentJobId;
       },
       tooltipText(job) {
-        return `${_.escape(job.name)} - ${job.status.tooltip}`;
+        return `${job.name} - ${job.status.tooltip}`;
       },
     },
   };
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index f2d98b08933..78ec11ab201 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -36,7 +36,7 @@
       },
     },
     computed: {
-      ...mapState(['job', 'isLoading', 'stages', 'jobs', 'selectedStage']),
+      ...mapState(['job', 'isLoading', 'stages', 'jobs', 'selectedStage', 'isLoadingStages']),
       coverage() {
         return `${this.job.coverage}%`;
       },
@@ -274,6 +274,7 @@
           />
 
           <stages-dropdown
+            v-if="!isLoadingStages"
             :stages="stages"
             :pipeline="job.pipeline"
             :selected-stage="selectedStage"
diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue
index 4b0900a75cc..55324d92176 100644
--- a/app/assets/javascripts/jobs/components/stages_dropdown.vue
+++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -22,7 +22,6 @@
         required: true,
       },
     },
-
     computed: {
       hasRef() {
         return !_.isEmpty(this.pipeline.ref);
diff --git a/app/assets/javascripts/jobs/store/mutations.js b/app/assets/javascripts/jobs/store/mutations.js
index f00e06e1a6c..b9c932f83e9 100644
--- a/app/assets/javascripts/jobs/store/mutations.js
+++ b/app/assets/javascripts/jobs/store/mutations.js
@@ -60,7 +60,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;
     }
   },
diff --git a/app/assets/javascripts/jobs/store/state.js b/app/assets/javascripts/jobs/store/state.js
index afbc959bb71..331809834c4 100644
--- a/app/assets/javascripts/jobs/store/state.js
+++ b/app/assets/javascripts/jobs/store/state.js
@@ -1,5 +1,3 @@
-import { __ } from '~/locale';
-
 export default () => ({
   jobEndpoint: null,
   traceEndpoint: null,
@@ -36,7 +34,7 @@ export default () => ({
   // sidebar dropdown
   isLoadingStages: false,
   isLoadingJobs: false,
-  selectedStage: __('More'),
+  selectedStage: '',
   stages: [],
   jobs: [],
 });
diff --git a/changelogs/unreleased/11-4-stable-gitlab-ui-ie11.yml b/changelogs/unreleased/11-4-stable-gitlab-ui-ie11.yml
new file mode 100644
index 00000000000..7bf87d9cbfa
--- /dev/null
+++ b/changelogs/unreleased/11-4-stable-gitlab-ui-ie11.yml
@@ -0,0 +1,5 @@
+---
+title: Update gitlab-ui dependency to 1.8.0-hotfix.1 to fix IE11 bug
+merge_request:
+author:
+type: fixed
diff --git a/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml b/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml
new file mode 100644
index 00000000000..c5ec2322fb5
--- /dev/null
+++ b/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml
@@ -0,0 +1,5 @@
+---
+title: Remove duplicate escape in job sidebar
+merge_request:
+author:
+type: fixed
diff --git a/changelogs/unreleased/53133-jobs-list-11-4-backport.yml b/changelogs/unreleased/53133-jobs-list-11-4-backport.yml
new file mode 100644
index 00000000000..a442e1703cb
--- /dev/null
+++ b/changelogs/unreleased/53133-jobs-list-11-4-backport.yml
@@ -0,0 +1,4 @@
+title: Fix stage dropdown not rendering in different languages
+merge_request: 
+author:
+type: other
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index bc6ecdf4f32..64219737d61 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -2,8 +2,8 @@
 
 Two-factor Authentication (2FA) provides an additional level of security to your
 GitLab account. Once enabled, in addition to supplying your username and
-password to login, you'll be prompted for a code generated by your one time password 
-authenticator. For example, a password manager on one of your devices. 
+password to login, you'll be prompted for a code generated by your one time password
+authenticator. For example, a password manager on one of your devices.
 
 By enabling 2FA, the only way someone other than you can log into your account
 is to know your username and password *and* have access to your one time password secret.
@@ -83,9 +83,11 @@ Click on **Register U2F Device** to complete the process.
 Recovery codes are not generated for U2F devices.
 
 Should you ever lose access to your one time password authenticator, you can use one of the ten provided
-backup codes to login to your account. We suggest copying or printing them for
-storage in a safe place. **Each code can be used only once** to log in to your
-account.
+backup codes to login to your account. We suggest copying them, printing them, or downloading them using
+the **Download codes** button for storage in a safe place.
+
+CAUTION: **Caution:**
+Each code can be used only once to log in to your account.
 
 If you lose the recovery codes or just want to generate new ones, you can do so
 [using SSH](#generate-new-recovery-codes-using-ssh).
diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md
index 631f511b5fa..d78721f8658 100644
--- a/doc/user/project/issues/issues_functionalities.md
+++ b/doc/user/project/issues/issues_functionalities.md
@@ -118,9 +118,12 @@ is the `project-name`, and `xxx` is the issue number.
 
 #### 13. @mentions
 
-- Mentions: you can either `@mention` a user or a group present in your
-GitLab instance and they will be notified via todos and email, unless that
-person has disabled all notifications in their profile settings.
+- You can either `@mention` a user or a group present in your
+  GitLab instance and they will be notified via todos and email, unless that
+  person has disabled all notifications in their profile settings.
+- Mentions for yourself (the current logged in user),will be distinctly highlighted
+  in a different color, allowing you to easily see which comments involve you,
+  helping you focus on them quickly.
 
 To change your [notification settings](../../../workflow/notifications.md) navigate to
 **Profile Settings** > **Notifications** > **Global notification level**
diff --git a/package.json b/package.json
index 35984e6d81f..3d51217bf60 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@gitlab-org/gitlab-svgs": "^1.29.0",
-    "@gitlab-org/gitlab-ui": "^1.8.0",
+    "@gitlab-org/gitlab-ui": "1.8.0-hotfix.1",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-loader": "^8.0.4",
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index a3a301504ff..24bb0816402 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -151,9 +151,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
       end
 
       it 'renders escaped tooltip name' do
-        page.within('aside.right-sidebar') do
-          expect(find('.active.build-job a')['data-original-title']).to eq('&lt;img src=x onerror=alert(document.domain)&gt; - passed')
-        end
+        page.find('.active.build-job a').hover
+        expect(page).to have_content('<img src=x onerror=alert(document.domain)> - passed')
       end
     end
 
diff --git a/spec/javascripts/jobs/components/sidebar_spec.js b/spec/javascripts/jobs/components/sidebar_spec.js
index a113377b19f..f7d8a45a17e 100644
--- a/spec/javascripts/jobs/components/sidebar_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_spec.js
@@ -148,10 +148,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();
       });
     });
 
diff --git a/spec/javascripts/jobs/store/mutations_spec.js b/spec/javascripts/jobs/store/mutations_spec.js
index d857c116180..a274c477e9c 100644
--- a/spec/javascripts/jobs/store/mutations_spec.js
+++ b/spec/javascripts/jobs/store/mutations_spec.js
@@ -123,8 +123,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');
     });
diff --git a/yarn.lock b/yarn.lock
index 7967ad0eb34..89959c22245 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -621,10 +621,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.31.0.tgz#495b074669f93af40e34f9978ce887773dea470a"
   integrity sha512-tJbf99XX/ddFkXCXxQr9a0GJD9rPVoW3qMbU14dkxwG4WBmPEoVg+e7sLvm9OWTD1uUqiVW3qWKp++SGhhcRlw==
 
-"@gitlab-org/gitlab-ui@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.8.0.tgz#dee33d78f68c91644273dbd51734b796108263ee"
-  integrity sha512-Owm8bkP4vEihiLD3pmMw1r+UWr3WYGaGUtj0JcwaAg3d05ZneozFEZjazIOWeYTcFsk+ZvNmSk1UA+ARIauhgQ==
+"@gitlab-org/gitlab-ui@1.8.0-hotfix.1":
+  version "1.8.0-hotfix.1"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.8.0-hotfix.1.tgz#172150dc45f9900e62ce4de6f88603bdbcf9fa68"
+  integrity sha512-qJdB/YpB2J/tReKAoOEaGh5djBMLnmE0qIVCho28FYpICznezrTwCVYm8D5zHQU16F3NA5M7HCtcLw8NPYt2yA==
   dependencies:
     "@gitlab-org/gitlab-svgs" "^1.23.0"
     bootstrap-vue "^2.0.0-rc.11"