Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/visual_review_toolbar/components/comment.js

@@ -18,6 +18,7 @@ const resetCommentBox = () => {
   const commentBox = selectCommentBox();
   const commentButton = selectCommentButton();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Send feedback';
   commentButton.classList.replace('gitlab-button-secondary', 'gitlab-button-success');
   commentButton.style.opacity = 1;
@@ -43,7 +44,9 @@ const confirmAndClear = mergeRequestId => {
   const commentButton = selectCommentButton();
   const currentNote = selectNote();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Feedback sent';
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   currentNote.innerText = `Your comment was successfully posted to merge request #${mergeRequestId}`;
   setTimeout(resetComment, 2000);
 };
@@ -52,6 +55,7 @@ const setInProgressState = () => {
   const commentButton = selectCommentButton();
   const commentBox = selectCommentBox();
 
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   commentButton.innerText = 'Sending feedback';
   commentButton.classList.replace('gitlab-button-success', 'gitlab-button-secondary');
   commentButton.style.opacity = 0.5;
@@ -79,6 +83,7 @@ const postComment = ({
   const commentText = selectCommentBox().value.trim();
 
   if (!commentText) {
+    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
     postError('Your comment appears to be empty.', COMMENT_BOX);
     resetCommentBox();
     return;

app/assets/javascripts/visual_review_toolbar/components/login.js

@@ -40,6 +40,7 @@ const authorizeUser = state => {
   const token = selectToken().value;
 
   if (!token) {
+    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
     postError('Please enter your token.', TOKEN_BOX);
     return;
   }

app/assets/javascripts/visual_review_toolbar/components/utils.js

@@ -12,6 +12,7 @@ import {
 } from './constants';
 
 // this style must be applied inline in a handful of components
+/* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
 const buttonClearStyles = `
   -webkit-appearance: none;
 `;

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

@@ -15,6 +15,7 @@ const state = {
 
 // adapted from https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator#Example_2_Browser_detect_and_return_an_index
 const getBrowserId = sUsrAg => {
+  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
   const aKeys = ['MSIE', 'Edge', 'Firefox', 'Safari', 'Chrome', 'Opera'];
   let nIdx = aKeys.length - 1;
 

doc/ssh/README.md

@@ -64,9 +64,14 @@ Following [best practices](https://linux-audit.com/using-ed25519-openssh-keys-in
 you should always favor [ED25519](https://ed25519.cr.yp.to/) SSH keys, since they
 are more secure and have better performance over the other types.
 
-They were introduced in OpenSSH 6.5, so any modern OS should include the
-option to create them. If for any reason your OS or the GitLab instance you
-interact with doesn't support this, you can fallback to RSA.
+ED25519 SSH keys were introduced in OpenSSH 6.5, 
+so any modern OS should include the option to create them. 
+If for any reason your OS or the GitLab instance you interact with doesn't 
+support ED25519, you can fallback to RSA.
+
+NOTE: **Note:**
+Omnibus does not ship with OpenSSH, so it uses the version on your GitLab server. If using 
+Omnibus, ensure the version of OpenSSH installed is version 6.5 or newer if you want to use ED25519 SSH keys.
 
 ### RSA SSH keys