Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITALY_SERVER_VERSION

@@ -1 +1 @@
-6941c499e077fe2303dd5c31a08807d14ad7a616
+529ef59e73a21d1abc54833c4edbe92cbcc9fb64

app/assets/javascripts/boards/stores/actions.js

@@ -40,11 +40,6 @@ import issueSetMilestoneMutation from '../graphql/issue_set_milestone.mutation.g
 import listsIssuesQuery from '../graphql/lists_issues.query.graphql';
 import * as types from './mutation_types';
 
-const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/require-i18n-strings */
-  throw new Error('Not implemented!');
-};
-
 export const gqlClient = createGqClient(
   {},
   {
@@ -737,28 +732,4 @@ export default {
   unsetError: ({ commit }) => {
     commit(types.SET_ERROR, undefined);
   },
-
-  fetchBacklog: () => {
-    notImplemented();
-  },
-
-  bulkUpdateIssues: () => {
-    notImplemented();
-  },
-
-  fetchIssue: () => {
-    notImplemented();
-  },
-
-  toggleIssueSubscription: () => {
-    notImplemented();
-  },
-
-  showPage: () => {
-    notImplemented();
-  },
-
-  toggleEmptyState: () => {
-    notImplemented();
-  },
 };

app/assets/javascripts/boards/stores/mutation_types.js

@@ -9,9 +9,7 @@ export const GENERATE_DEFAULT_LISTS_FAILURE = 'GENERATE_DEFAULT_LISTS_FAILURE';
 export const RECEIVE_BOARD_LISTS_SUCCESS = 'RECEIVE_BOARD_LISTS_SUCCESS';
 export const RECEIVE_BOARD_LISTS_FAILURE = 'RECEIVE_BOARD_LISTS_FAILURE';
 export const SHOW_PROMOTION_LIST = 'SHOW_PROMOTION_LIST';
-export const REQUEST_ADD_LIST = 'REQUEST_ADD_LIST';
 export const RECEIVE_ADD_LIST_SUCCESS = 'RECEIVE_ADD_LIST_SUCCESS';
-export const RECEIVE_ADD_LIST_ERROR = 'RECEIVE_ADD_LIST_ERROR';
 export const MOVE_LIST = 'MOVE_LIST';
 export const UPDATE_LIST_FAILURE = 'UPDATE_LIST_FAILURE';
 export const TOGGLE_LIST_COLLAPSED = 'TOGGLE_LIST_COLLAPSED';
@@ -20,19 +18,11 @@ export const REMOVE_LIST_FAILURE = 'REMOVE_LIST_FAILURE';
 export const REQUEST_ITEMS_FOR_LIST = 'REQUEST_ITEMS_FOR_LIST';
 export const RECEIVE_ITEMS_FOR_LIST_FAILURE = 'RECEIVE_ITEMS_FOR_LIST_FAILURE';
 export const RECEIVE_ITEMS_FOR_LIST_SUCCESS = 'RECEIVE_ITEMS_FOR_LIST_SUCCESS';
-export const REQUEST_ADD_ISSUE = 'REQUEST_ADD_ISSUE';
-export const RECEIVE_ADD_ISSUE_SUCCESS = 'RECEIVE_ADD_ISSUE_SUCCESS';
-export const RECEIVE_ADD_ISSUE_ERROR = 'RECEIVE_ADD_ISSUE_ERROR';
 export const UPDATE_BOARD_ITEM = 'UPDATE_BOARD_ITEM';
 export const REMOVE_BOARD_ITEM = 'REMOVE_BOARD_ITEM';
-export const REQUEST_UPDATE_ISSUE = 'REQUEST_UPDATE_ISSUE';
 export const MUTATE_ISSUE_SUCCESS = 'MUTATE_ISSUE_SUCCESS';
-export const RECEIVE_UPDATE_ISSUE_SUCCESS = 'RECEIVE_UPDATE_ISSUE_SUCCESS';
-export const RECEIVE_UPDATE_ISSUE_ERROR = 'RECEIVE_UPDATE_ISSUE_ERROR';
 export const ADD_BOARD_ITEM_TO_LIST = 'ADD_BOARD_ITEM_TO_LIST';
 export const REMOVE_BOARD_ITEM_FROM_LIST = 'REMOVE_BOARD_ITEM_FROM_LIST';
-export const SET_CURRENT_PAGE = 'SET_CURRENT_PAGE';
-export const TOGGLE_EMPTY_STATE = 'TOGGLE_EMPTY_STATE';
 export const SET_ACTIVE_ID = 'SET_ACTIVE_ID';
 export const UPDATE_BOARD_ITEM_BY_ID = 'UPDATE_BOARD_ITEM_BY_ID';
 export const SET_ASSIGNEE_LOADING = 'SET_ASSIGNEE_LOADING';

app/assets/javascripts/boards/stores/mutations.js

@@ -6,11 +6,6 @@ import { formatIssue } from '../boards_util';
 import { issuableTypes } from '../constants';
 import * as mutationTypes from './mutation_types';
 
-const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/require-i18n-strings */
-  throw new Error('Not implemented!');
-};
-
 const updateListItemsCount = ({ state, listId, value }) => {
   const list = state.boardLists[listId];
   if (state.issuableType === issuableTypes.epic) {
@@ -94,18 +89,10 @@ export default {
     state.error = s__('Boards|An error occurred while generating lists. Please reload the page.');
   },
 
-  [mutationTypes.REQUEST_ADD_LIST]: () => {
-    notImplemented();
-  },
-
   [mutationTypes.RECEIVE_ADD_LIST_SUCCESS]: (state, list) => {
     Vue.set(state.boardLists, list.id, list);
   },
 
-  [mutationTypes.RECEIVE_ADD_LIST_ERROR]: () => {
-    notImplemented();
-  },
-
   [mutationTypes.MOVE_LIST]: (state, { movedList, listAtNewIndex }) => {
     const { boardLists } = state;
     Vue.set(boardLists, movedList.id, movedList);
@@ -172,35 +159,11 @@ export default {
     state.isSettingAssignees = isLoading;
   },
 
-  [mutationTypes.REQUEST_ADD_ISSUE]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.RECEIVE_ADD_ISSUE_SUCCESS]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.RECEIVE_ADD_ISSUE_ERROR]: () => {
-    notImplemented();
-  },
-
   [mutationTypes.MUTATE_ISSUE_SUCCESS]: (state, { issue }) => {
     const issueId = getIdFromGraphQLId(issue.id);
     Vue.set(state.boardItems, issueId, formatIssue({ ...issue, id: issueId }));
   },
 
-  [mutationTypes.REQUEST_UPDATE_ISSUE]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.RECEIVE_UPDATE_ISSUE_SUCCESS]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.RECEIVE_UPDATE_ISSUE_ERROR]: () => {
-    notImplemented();
-  },
-
   [mutationTypes.ADD_BOARD_ITEM_TO_LIST]: (
     state,
     { itemId, listId, moveBeforeId, moveAfterId, atIndex },
@@ -220,14 +183,6 @@ export default {
     Vue.delete(state.boardItems, itemId);
   },
 
-  [mutationTypes.SET_CURRENT_PAGE]: () => {
-    notImplemented();
-  },
-
-  [mutationTypes.TOGGLE_EMPTY_STATE]: () => {
-    notImplemented();
-  },
-
   [mutationTypes.REQUEST_GROUP_PROJECTS]: (state, fetchNext) => {
     Vue.set(state, 'groupProjectsFlags', {
       [fetchNext ? 'isLoadingMore' : 'isLoading']: true,

app/assets/javascripts/vue_shared/directives/validation.js

@@ -33,6 +33,10 @@ const focusFirstInvalidInput = (e) => {
   }
 };
 
+const getInputElement = (el) => {
+  return el.querySelector('input') || el;
+};
+
 const isEveryFieldValid = (form) => Object.values(form.fields).every(({ state }) => state === true);
 
 const createValidator = (context, feedbackMap) => ({ el, reportInvalidInput = false }) => {
@@ -91,8 +95,9 @@ export default function initValidation(customFeedbackMap = {}) {
   const elDataMap = new WeakMap();
 
   return {
-    inserted(el, binding, { context }) {
+    inserted(element, binding, { context }) {
       const { arg: showGlobalValidation } = binding;
+      const el = getInputElement(element);
       const { form: formEl } = el;
 
       const validate = createValidator(context, feedbackMap);
@@ -121,7 +126,8 @@ export default function initValidation(customFeedbackMap = {}) {
 
       validate({ el, reportInvalidInput: showGlobalValidation });
     },
-    update(el, binding) {
+    update(element, binding) {
+      const el = getInputElement(element);
       const { arg: showGlobalValidation } = binding;
       const { validate, isTouched, isBlurred } = elDataMap.get(el);
       const showValidationFeedback = showGlobalValidation || (isTouched && isBlurred);

app/models/concerns/issuable.rb

@@ -103,7 +103,7 @@ def award_emojis_loaded?
     end
     scope :assigned_to, ->(u) do
       assignees_table = Arel::Table.new("#{to_ability_name}_assignees")
-      sql = assignees_table.project('true').where(assignees_table[:user_id].in(u)).where(Arel::Nodes::SqlLiteral.new("#{to_ability_name}_id = #{to_ability_name}s.id"))
+      sql = assignees_table.project('true').where(assignees_table[:user_id].in(u.id)).where(Arel::Nodes::SqlLiteral.new("#{to_ability_name}_id = #{to_ability_name}s.id"))
       where("EXISTS (#{sql.to_sql})")
     end
     # rubocop:enable GitlabSecurity/SqlInjection

app/models/merge_request.rb

@@ -381,15 +381,15 @@ def public_merge_status
   scope :review_requested_to, ->(user) do
     where(
       reviewers_subquery
-        .where(Arel::Table.new("#{to_ability_name}_reviewers")[:user_id].eq(user))
+        .where(Arel::Table.new("#{to_ability_name}_reviewers")[:user_id].eq(user.id))
         .exists
     )
   end
 
   scope :no_review_requested_to, ->(user) do
     where(
       reviewers_subquery
-        .where(Arel::Table.new("#{to_ability_name}_reviewers")[:user_id].eq(user))
+        .where(Arel::Table.new("#{to_ability_name}_reviewers")[:user_id].eq(user.id))
         .exists
         .not
     )

app/views/layouts/nav/sidebar/_project_menus.html.haml

@@ -11,4 +11,5 @@
       - if sidebar.render_raw_menus_partial
         = render sidebar.render_raw_menus_partial
 
+      = render partial: 'shared/nav/sidebar_hidden_menu_item', collection: sidebar.hidden_menu&.items
     = render 'shared/sidebar_toggle_button'

app/views/shared/nav/_sidebar.html.haml

@@ -0,0 +1,3 @@
+%li.hidden
+  = link_to sidebar_hidden_menu_item.link, **sidebar_hidden_menu_item.container_html_options do
+    = sidebar_hidden_menu_item.title