Add latest changes from gitlab-org/gitlab@master

changelogs/unreleased/fix-pipeline-details-invalid-buttons.yml

+---
+title: Fix pipeline details page initialisation on invalid pipeline
+merge_request: 25302
+author: Fabio Huser
+type: fixed

doc/api/graphql/reference/gitlab_schema.graphql

@@ -2770,6 +2770,16 @@ type Group {
   """
   avatarUrl: String
+  """
+  A single board of the group
+  """
+  board(
+    """
+    Find a board by its ID
+    """
+    id: ID
+  ): Board
+
   """
   Boards of the group
   """
@@ -2789,6 +2799,11 @@ type Group {
     """
     first: Int
+    """
+    Find a board by its ID
+    """
+    id: ID
+
     """
     Returns the last _n_ elements from the list.
     """
@@ -5254,6 +5269,16 @@ type Project {
   """
   avatarUrl: String
+  """
+  A single board of the project
+  """
+  board(
+    """
+    Find a board by its ID
+    """
+    id: ID
+  ): Board
+
   """
   Boards of the project
   """
@@ -5273,6 +5298,11 @@ type Project {
     """
     first: Int
+    """
+    Find a board by its ID
+    """
+    id: ID
+
     """
     Returns the last _n_ elements from the list.
     """

doc/api/graphql/reference/gitlab_schema.json

@@ -368,10 +368,43 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "board",
+              "description": "A single board of the project",
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Find a board by its ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Board",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "boards",
               "description": "Boards of the project",
               "args": [
+                {
+                  "name": "id",
+                  "description": "Find a board by its ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -3175,10 +3208,43 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "board",
+              "description": "A single board of the group",
+              "args": [
+                {
+                  "name": "id",
+                  "description": "Find a board by its ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Board",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "boards",
               "description": "Boards of the group",
               "args": [
+                {
+                  "name": "id",
+                  "description": "Find a board by its ID",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",

doc/api/graphql/reference/index.md

@@ -426,6 +426,7 @@ Autogenerated return type of EpicTreeReorder
 | ---   |  ---- | ----------  |
 | `autoDevopsEnabled` | Boolean | Indicates whether Auto DevOps is enabled for all projects within this group |
 | `avatarUrl` | String | Avatar URL of the group |
+| `board` | Board | A single board of the group |
 | `description` | String | Description of the namespace |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `emailsDisabled` | Boolean | Indicates if a group has email notifications disabled |
@@ -801,6 +802,7 @@ Information about pagination in a connection.
 | `archived` | Boolean | Indicates the archived status of the project |
 | `autocloseReferencedIssues` | Boolean | Indicates if issues referenced by merge requests and commits within the default branch are closed automatically |
 | `avatarUrl` | String | URL to avatar image file of the project |
+| `board` | Board | A single board of the project |
 | `containerRegistryEnabled` | Boolean | Indicates if the project stores Docker container images in a container registry |
 | `createdAt` | Time | Timestamp of the project creation |
 | `description` | String | Short description of the project |

doc/development/contributing/issue_workflow.md

@@ -2,7 +2,7 @@
 ## Issue tracker guidelines
-**[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab-foss/issues)** for similar entries before
+**[Search the issue tracker](https://gitlab.com/gitlab-org/gitlab/issues)** for similar entries before
 submitting your own, there's a good chance somebody else had the same issue or
 feature proposal. Show your support with an award emoji and/or join the
 discussion.
@@ -35,7 +35,7 @@ project.
 ## Labels
 To allow for asynchronous issue handling, we use [milestones](https://gitlab.com/groups/gitlab-org/-/milestones)
-and [labels](https://gitlab.com/gitlab-org/gitlab-foss/-/labels). Leads and product managers handle most of the
+and [labels](https://gitlab.com/gitlab-org/gitlab/-/labels). Leads and product managers handle most of the
 scheduling into milestones. Labelling is a task for everyone.
 Most issues will have labels for at least one of the following:
@@ -53,7 +53,7 @@ Most issues will have labels for at least one of the following:
 - Severity: ~`S1`, `~S2`, `~S3`, `~S4`
 All labels, their meaning and priority are defined on the
-[labels page](https://gitlab.com/gitlab-org/gitlab-foss/-/labels).
+[labels page](https://gitlab.com/gitlab-org/gitlab/-/labels).
 If you come across an issue that has none of these, and you're allowed to set
 labels, you can _always_ add the team and type, and often also the subject.
@@ -372,14 +372,11 @@ A recent example of this was the issue for
 ## Feature proposals
-To create a feature proposal for CE, open an issue on the
-[issue tracker of CE](https://gitlab.com/gitlab-org/gitlab-foss/issues).
-
-For feature proposals for EE, open an issue on the
-[issue tracker of EE](https://gitlab.com/gitlab-org/gitlab/issues).
+To create a feature proposal, open an issue on the
+[issue tracker](https://gitlab.com/gitlab-org/gitlab/issues).
 In order to help track the feature proposals, we have created a
-[`feature`](https://gitlab.com/gitlab-org/gitlab-foss/issues?label_name=feature) label. For the time being, users that are not members
+[`feature`](https://gitlab.com/gitlab-org/gitlab/issues?label_name=feature) label. For the time being, users that are not members
 of the project cannot add labels. You can instead ask one of the [core team](https://about.gitlab.com/community/core-team/)
 members to add the label ~feature to the issue or add the following
 code snippet right after your description in a new line: `~feature`.
@@ -441,7 +438,7 @@ addressed.
 ## Technical and UX debt
 In order to track things that can be improved in GitLab's codebase,
-we use the ~"technical debt" label in [GitLab's issue tracker](https://gitlab.com/gitlab-org/gitlab-foss/issues).
+we use the ~"technical debt" label in [GitLab's issue tracker](https://gitlab.com/gitlab-org/gitlab/issues).
 For missed user experience requirements, we use the ~"UX debt" label.
 These labels should be added to issues that describe things that can be improved,

doc/development/migration_style_guide.md

@@ -472,7 +472,7 @@ end
 ```
 If a computed update is needed, the value can be wrapped in `Arel.sql`, so Arel
-treats it as an SQL literal. It's also a required deprecation for [Rails 6](https://gitlab.com/gitlab-org/gitlab-foss/issues/61451).
+treats it as an SQL literal. It's also a required deprecation for [Rails 6](https://gitlab.com/gitlab-org/gitlab/issues/28497).
 The below example is the same as the one above, but
 the value is set to the product of the `bar` and `baz` columns:

doc/development/module_with_instance_variables.md

@@ -30,11 +30,11 @@ People are saying multiple inheritance is bad. Mixing multiple modules with
 multiple instance variables scattering everywhere suffer from the same issue.
 The same applies to `ActiveSupport::Concern`. See:
 [Consider replacing concerns with dedicated classes & composition](
-https://gitlab.com/gitlab-org/gitlab-foss/issues/23786)
+https://gitlab.com/gitlab-org/gitlab/issues/16270)
 There's also a similar idea:
 [Use decorators and interface segregation to solve overgrowing models problem](
-https://gitlab.com/gitlab-org/gitlab-foss/issues/13484)
+https://gitlab.com/gitlab-org/gitlab/issues/14235)
 Note that `included` doesn't solve the whole issue. They define the
 dependencies, but they still allow each modules to talk implicitly via the

doc/development/namespaces_storage_statistics.md

@@ -25,7 +25,7 @@ by [`Namespaces#with_statistics`](https://gitlab.com/gitlab-org/gitlab/blob/4ab5
 Additionally, the pattern that is currently used to update the project statistics
 (the callback) doesn't scale adequately. It is currently one of the largest
-[database queries transactions on production](https://gitlab.com/gitlab-org/gitlab-foss/issues/62488)
+[database queries transactions on production](https://gitlab.com/gitlab-org/gitlab/issues/29070)
 that takes the most time overall. We can't add one more query to it as
 it will increase the transaction's length.
@@ -142,7 +142,7 @@ but we refresh them through Sidekiq jobs and in different transactions:
 1. Create a second table (`namespace_aggregation_schedules`) with two columns `id` and `namespace_id`.
 1. Whenever the statistics of a project changes, insert a row into `namespace_aggregation_schedules`
    - We don't insert a new row if there's already one related to the root namespace.
-   - Keeping in mind the length of the transaction that involves updating `project_statistics`(<https://gitlab.com/gitlab-org/gitlab-foss/issues/62488>), the insertion should be done in a different transaction and through a Sidekiq Job.
+   - Keeping in mind the length of the transaction that involves updating `project_statistics`(<https://gitlab.com/gitlab-org/gitlab/issues/29070>), the insertion should be done in a different transaction and through a Sidekiq Job.
 1. After inserting the row, we schedule another worker to be executed async at two different moments:
    - One enqueued for immediate execution and another one scheduled in `1.5h` hours.
    - We only schedule the jobs, if we can obtain a `1.5h` lease on Redis on a key based on the root namespace ID.
@@ -162,7 +162,7 @@ This implementation has the following benefits:
 The only downside of this approach is that namespaces' statistics are updated up to `1.5` hours after the change is done,
 which means there's a time window in which the statistics are inaccurate. Because we're still not
-[enforcing storage limits](https://gitlab.com/gitlab-org/gitlab-foss/issues/30421), this is not a major problem.
+[enforcing storage limits](https://gitlab.com/gitlab-org/gitlab/issues/17664), this is not a major problem.
 ## Conclusion

doc/user/project/integrations/webhooks.md

@@ -45,7 +45,7 @@ They are available **per project** for GitLab Community Edition,
 and **per project and per group** for **GitLab Enterprise Edition**.
 Navigate to the webhooks page by going to your project's
-**Settings ➔ Integrations**.
+**Settings ➔ Webhooks**.
 ## Maximum number of webhooks (per tier)

doc/user/project/push_options.md

@@ -6,8 +6,8 @@ type: reference
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/15643) in GitLab 11.7.
-GitLab supports using [Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
-to perform various actions at the same time as pushing changes.
+GitLab supports using client-side [Git push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt)
+to perform various actions at the same time as pushing changes. Additionally, [Push Rules](https://docs.gitlab.com/ee/push_rules/push_rules.html) offer server-side control and enforcement options.
 Currently, there are push options available for:

locale/gitlab.pot

@@ -6997,9 +6997,6 @@ msgstr ""
 msgid "Edit Pipeline Schedule %{id}"
 msgstr ""
-msgid "Edit Project Hook"
-msgstr ""
-
 msgid "Edit Release"
 msgstr ""
@@ -9451,6 +9448,9 @@ msgstr ""
 msgid "Go to %{link_to_google_takeout}."
 msgstr ""
+msgid "Go to Webhooks"
+msgstr ""
+
 msgid "Go to commits"
 msgstr ""
@@ -10607,10 +10607,13 @@ msgstr ""
 msgid "Instance license"
 msgstr ""
+msgid "Integration Settings"
+msgstr ""
+
 msgid "Integrations"
 msgstr ""
-msgid "Integrations Settings"
+msgid "Integrations allow you to integrate GitLab with other applications"
 msgstr ""
 msgid "Interested parties can even contribute by pushing commits if they want to."
@@ -14780,9 +14783,6 @@ msgstr ""
 msgid "Project Files"
 msgstr ""
-msgid "Project Hooks"
-msgstr ""
-
 msgid "Project ID"
 msgstr ""
@@ -14945,30 +14945,18 @@ msgstr ""
 msgid "ProjectService|Comment will be posted on each event"
 msgstr ""
-msgid "ProjectService|Integrations"
-msgstr ""
-
 msgid "ProjectService|Last edit"
 msgstr ""
 msgid "ProjectService|Perform common operations on GitLab project: %{project_name}"
 msgstr ""
-msgid "ProjectService|Project services"
-msgstr ""
-
-msgid "ProjectService|Project services allow you to integrate GitLab with other applications"
-msgstr ""
-
 msgid "ProjectService|Service"
 msgstr ""
 msgid "ProjectService|Services"
 msgstr ""
-msgid "ProjectService|Settings"
-msgstr ""
-
 msgid "ProjectService|To set up this service:"
 msgstr ""
@@ -21811,6 +21799,15 @@ msgstr ""
 msgid "WebIDE|Merge request"
 msgstr ""
+msgid "Webhook"
+msgstr ""
+
+msgid "Webhook Logs"
+msgstr ""
+
+msgid "Webhook Settings"
+msgstr ""
+
 msgid "Webhooks"
 msgstr ""
@@ -21820,6 +21817,9 @@ msgstr ""
 msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
 msgstr ""
+msgid "Webhooks have moved. They can now be found under the Settings menu."
+msgstr ""
+
 msgid "Wednesday"
 msgstr ""

spec/controllers/projects/hooks_controller_spec.rb

@@ -12,12 +12,11 @@ describe Projects::HooksController do
   end
   describe '#index' do
-    it 'redirects to settings/integrations page' do
-      get(:index, params: { namespace_id: project.namespace, project_id: project })
-      expect(response).to redirect_to(
-        project_settings_integrations_path(project)
-      )
+    it 'renders index with 200 status code' do
+      get :index, params: { namespace_id: project.namespace, project_id: project }
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(response).to render_template(:index)
     end
   end

spec/factories/ci/pipelines.rb

@@ -22,6 +22,7 @@ FactoryBot.define do
     factory :ci_pipeline do
       trait :invalid do
+        status { :failed }
         yaml_errors { 'invalid YAML' }
         failure_reason { :config_error }
       end

spec/features/projects/navbar_spec.rb

@@ -88,6 +88,7 @@ describe 'Project navbar' do
           _('General'),
           _('Members'),
           _('Integrations'),
+          _('Webhooks'),
           _('Repository'),
           _('CI / CD'),
           _('Operations'),

spec/features/projects/pipelines/pipeline_spec.rb

@@ -1077,8 +1077,6 @@ describe 'Pipeline', :js do
     end
     context 'when pipeline has configuration errors' do
-      include_context 'pipeline builds'
-
       let(:pipeline) do
         create(:ci_pipeline,
                :invalid,
@@ -1119,6 +1117,10 @@ describe 'Pipeline', :js do
             %Q{span[title="#{pipeline.present.failure_reason}"]})
         end
       end
+
+      it 'contains a pipeline header with title' do
+        expect(page).to have_content "Pipeline ##{pipeline.id}"
+      end
     end
     context 'when pipeline is stuck' do

spec/features/projects/services/user_views_services_spec.rb

@@ -14,7 +14,7 @@ describe 'User views services' do
   end
   it 'shows the list of available services' do
-    expect(page).to have_content('Project services')
+    expect(page).to have_content('Integrations')
     expect(page).to have_content('Campfire')
     expect(page).to have_content('HipChat')
     expect(page).to have_content('Assembla')

spec/features/projects/settings/operations_settings_spec.rb

@@ -35,7 +35,7 @@ describe 'Projects > Settings > For a forked project', :js do
       end
       it 'renders form for incident management' do
-        expect(page).to have_selector('h4', text: 'Incidents')
+        expect(page).to have_selector('h3', text: 'Incidents')
       end
       it 'sets correct default values' do

spec/features/projects/settings/integration_settings_spec.rb → spec/features/projects/settings/webhooks_settings_spec.rb

@@ -2,11 +2,10 @@
 require 'spec_helper'
-describe 'Projects > Settings > Integration settings' do
+describe 'Projects > Settings > Webhook Settings' do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:role) { :developer }
-  let(:integrations_path) { project_settings_integrations_path(project) }
+  let(:webhooks_path) { project_hooks_path(project) }
   before do
     sign_in(user)
@@ -17,7 +16,7 @@ describe 'Projects > Settings > Integration settings' do
     let(:role) { :developer }
     it 'to be disallowed to view' do
-      visit integrations_path
+      visit webhooks_path
       expect(page.status_code).to eq(404)
     end
@@ -33,7 +32,7 @@ describe 'Projects > Settings > Integration settings' do
       it 'show list of webhooks' do
         hook
-        visit integrations_path
+        visit webhooks_path
         expect(page.status_code).to eq(200)
         expect(page).to have_content(hook.url)
@@ -49,7 +48,7 @@ describe 'Projects > Settings > Integration settings' do
       end
       it 'create webhook' do
-        visit integrations_path
+        visit webhooks_path
         fill_in 'hook_url', with: url
         check 'Tag push events'
@@ -68,7 +67,7 @@ describe 'Projects > Settings > Integration settings' do
       it 'edit existing webhook' do
         hook
-        visit integrations_path
+        visit webhooks_path
         click_link 'Edit'
         fill_in 'hook_url', with: url
@@ -81,25 +80,25 @@ describe 'Projects > Settings > Integration settings' do
       it 'test existing webhook', :js do
         WebMock.stub_request(:post, hook.url)
-        visit integrations_path
+        visit webhooks_path
         find('.hook-test-button.dropdown').click
         click_link 'Push events'
-        expect(current_path).to eq(integrations_path)
+        expect(current_path).to eq(webhooks_path)
       end
       context 'delete existing webhook' do
         it 'from webhooks list page' do
           hook
-          visit integrations_path
+          visit webhooks_path
           expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1)
         end
         it 'from webhook edit page' do
           hook
-          visit integrations_path
+          visit webhooks_path
           click_link 'Edit'
           expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1)

spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap

@@ -8,13 +8,13 @@ exports[`grafana integration component default state to match the default snapsh
   <div
     class="settings-header"
   >
-    <h4
-      class="js-section-header"
+    <h3
+      class="js-section-header h4"
     >
       
       Grafana Authentication
     
-    </h4>
+    </h3>
      
     <gl-button-stub
       class="js-settings-toggle"