Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/boards/boards_util.js

@@ -83,6 +83,10 @@ export function fullBoardId(boardId) {
   return `gid://gitlab/Board/${boardId}`;
 }
 
+export function fullIterationId(id) {
+  return `gid://gitlab/Iteration/${id}`;
+}
+
 export function fullLabelId(label) {
   if (label.project_id !== null) {
     return `gid://gitlab/ProjectLabel/${label.id}`;
@@ -141,6 +145,7 @@ export default {
   formatListIssues,
   fullBoardId,
   fullLabelId,
+  fullIterationId,
   getBoardsPath,
   isListDraggable,
 };

app/assets/javascripts/boards/components/board_form.vue

@@ -15,6 +15,7 @@ const boardDefaults = {
   name: '',
   labels: [],
   milestone_id: undefined,
+  iteration_id: undefined,
   assignee: {},
   assignee_id: undefined,
   weight: null,
@@ -171,6 +172,9 @@ export default {
     }
   },
   methods: {
+    setIteration(iterationId) {
+      this.board.iteration_id = iterationId;
+    },
     callBoardMutation(id) {
       return this.$apollo.mutate({
         mutation: createBoardMutation,
@@ -289,6 +293,7 @@ export default {
         :project-id="projectId"
         :group-id="groupId"
         :weights="weights"
+        @set-iteration="setIteration"
       />
     </form>
   </gl-modal>

app/assets/javascripts/boards/graphql/board.mutation.graphql

@@ -1,4 +1,4 @@
-mutation UpdateBoard($id: ID!, $hideClosedList: Boolean, $hideBacklogList: Boolean) {
+mutation UpdateBoard($id: BoardID!, $hideClosedList: Boolean, $hideBacklogList: Boolean) {
   updateBoard(
     input: { id: $id, hideClosedList: $hideClosedList, hideBacklogList: $hideBacklogList }
   ) {

changelogs/unreleased/add-flutter-cicd-template.yml

@@ -0,0 +1,5 @@
+---
+title: Add flutter CI/CD template
+merge_request: 46968
+author:
+type: added

doc/development/fe_guide/dependencies.md

@@ -8,12 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## Package manager
 
-We use [Yarn](https://yarnpkg.com/) to manage frontend dependencies. There are a few exceptions:
-
-- [FontAwesome](https://fontawesome.com/), installed via the `font-awesome-rails` gem: we are working to replace it with
-  [GitLab SVGs](https://gitlab-org.gitlab.io/gitlab-svgs/) icons library.
-- [ACE](https://ace.c9.io/) editor, installed via the `ace-rails-ap` gem.
-- Other dependencies found under `vendor/assets/`.
+We use [Yarn](https://yarnpkg.com/) to manage frontend dependencies. There are a few exceptions, stored in `vendor/assets/`.
 
 ## Updating dependencies
 

doc/development/fe_guide/icons.md

@@ -18,8 +18,6 @@ We are using SVG Icons in GitLab with a SVG Sprite.
 This means the icons are only loaded once, and are referenced through an ID.
 The sprite SVG is located under `/assets/icons.svg`.
 
-Our goal is to replace one by one all inline SVG Icons (as those currently bloat the HTML) and also all Font Awesome icons.
-
 ### Usage in HAML/Rails
 
 To use a sprite Icon in HAML or Rails we use a specific helper function:
@@ -90,11 +88,6 @@ Please use the following function inside JS to render an icon:
 
 ### Usage in HAML/Rails
 
-WARNING:
-Do not use the `spinner` or `icon('spinner spin')` rails helpers to insert
-loading icons. These helpers rely on the Font Awesome icon library which is
-deprecated.
-
 To insert a loading spinner in HAML or Rails use the `loading_icon` helper:
 
 ```haml

doc/user/project/issue_board.md

@@ -4,7 +4,7 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Issue Boards
+# Issue Boards **(CORE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5554) in [GitLab 8.11](https://about.gitlab.com/releases/2016/08/22/gitlab-8-11-released/#issue-board).
 
@@ -233,17 +233,18 @@ advanced functionality is present in [higher tiers only](https://about.gitlab.co
 
 ### Configurable issue boards **(STARTER)**
 
-> [Introduced](https://about.gitlab.com/releases/2017/11/22/gitlab-10-2-released/#issue-boards-configuration) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.2.
+> - [Introduced](https://about.gitlab.com/releases/2017/11/22/gitlab-10-2-released/#issue-boards-configuration) in GitLab 10.2.
+> - Setting current iteration as scope [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196804) in GitLab 13.7.
 
-An issue board can be associated with a GitLab [Milestone](milestones/index.md#milestones),
-[Labels](labels.md), Assignee and Weight
+An issue board can be associated with a [milestone](milestones/index.md#milestones),
+[labels](labels.md), assignee, weight, and current [iteration](../group/iterations/index.md),
 which automatically filter the board issues accordingly.
 This allows you to create unique boards according to your team's need.
 
 ![Create scoped board](img/issue_board_creation_v13_6.png)
 
 You can define the scope of your board when creating it or by clicking the **Edit board** button.
-After a milestone, assignee or weight is assigned to an issue board, you can no longer
+After a milestone, iteration, assignee, or weight is assigned to an issue board, you can no longer
 filter through these in the search bar. In order to do that, you need to remove the desired scope
 (for example, milestone, assignee, or weight) from the issue board.
 

lib/gitlab/ci/templates/Flutter.gitlab-ci.yml

@@ -0,0 +1,29 @@
+code_quality:
+  stage: test
+  image: "cirrusci/flutter:1.22.5"
+  before_script:
+    - pub global activate dart_code_metrics
+    - export PATH="$PATH":"$HOME/.pub-cache/bin"
+  script:
+    - metrics lib -r codeclimate  > gl-code-quality-report.json
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
+
+test:
+  stage: test
+  image: "cirrusci/flutter:1.22.5"
+  before_script:
+    - pub global activate junitreport
+    - export PATH="$PATH":"$HOME/.pub-cache/bin"
+  script:
+    - flutter test --machine --coverage | tojunit -o report.xml
+    - lcov --summary coverage/lcov.info
+    - genhtml coverage/lcov.info --output=coverage
+  coverage: '/lines\.*: \d+\.\d+\%/'
+  artifacts:
+    name: coverage
+    paths:
+      - $CI_PROJECT_DIR/coverage
+    reports:
+      junit: report.xml

locale/gitlab.pot

@@ -24208,6 +24208,9 @@ msgstr ""
 msgid "Scope"
 msgstr ""
 
+msgid "Scope board to current iteration"
+msgstr ""
+
 msgid "Scopes"
 msgstr ""
 

qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb

@@ -43,7 +43,9 @@ module QA
         end
       end
 
-      it 'user transfers a project between groups', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/406' do
+      it 'user transfers a project between groups',
+         testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/406',
+         quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/283925', type: :investigating, only: :production } do
         # Retry is needed here as the target group is not avaliable for transfer right away.
         QA::Support::Retrier.retry_on_exception(reload_page: page) do
           Page::File::Show.perform(&:go_to_general_settings)

spec/lib/gitlab/ci/templates/flutter_gitlab_ci_yaml_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Flutter.gitlab-ci.yml' do
+  subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Flutter') }
+
+  describe 'the created pipeline' do
+    let_it_be(:user) { create(:admin) }
+
+    let(:pipeline_branch) { 'master' }
+    let(:project) { create(:project, :custom_repo, files: { 'README.md' => '' }) }
+    let(:service) { Ci::CreatePipelineService.new(project, user, ref: pipeline_branch ) }
+    let(:pipeline) { service.execute!(:push) }
+    let(:build_names) { pipeline.builds.pluck(:name) }
+
+    before do
+      stub_ci_pipeline_yaml_file(template.content)
+      allow(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
+    end
+
+    it 'creates test and code_quality jobs' do
+      expect(build_names).to include('test', 'code_quality')
+    end
+  end
+end