diff options
| -rw-r--r-- | app/assets/javascripts/boards/components/board_card_inner.vue | 1 | ||||
| -rw-r--r-- | app/models/integrations/base_chat_notification.rb | 2 | ||||
| -rw-r--r-- | app/models/repository.rb | 4 | ||||
| -rw-r--r-- | db/migrate/20210707163659_add_vulnerability_events_to_integrations.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20210707163659 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 | ||||
| -rw-r--r-- | doc/api/oauth2.md | 2 | ||||
| -rw-r--r-- | doc/api/services.md | 4 | ||||
| -rw-r--r-- | doc/topics/git/lfs/migrate_to_git_lfs.md | 5 | ||||
| -rw-r--r-- | doc/topics/git/numerous_undo_possibilities_in_git/index.md | 1 | ||||
| -rw-r--r-- | doc/topics/gitlab_flow.md | 76 | ||||
| -rw-r--r-- | doc/topics/img/gitlab_flow_environment_branches.png | bin | 12354 -> 0 bytes | |||
| -rw-r--r-- | doc/topics/img/gitlab_flow_github_flow.png | bin | 6173 -> 0 bytes | |||
| -rw-r--r-- | doc/topics/img/gitlab_flow_production_branch.png | bin | 7262 -> 0 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/slack.md | 27 | ||||
| -rw-r--r-- | locale/gitlab.pot | 14 | ||||
| -rw-r--r-- | spec/models/repository_spec.rb | 3 |
17 files changed, 112 insertions, 38 deletions
diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 5658a34e9a6..6c00f987b16 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -218,6 +218,7 @@ export default { :href="item.path || item.webUrl || ''" :title="item.title" :class="{ 'gl-text-gray-400!': item.isLoading }" + class="js-no-trigger" @mousemove.stop >{{ item.title }}</a > diff --git a/app/models/integrations/base_chat_notification.rb b/app/models/integrations/base_chat_notification.rb index 5eae8bce92a..c6335782b5e 100644 --- a/app/models/integrations/base_chat_notification.rb +++ b/app/models/integrations/base_chat_notification.rb @@ -253,3 +253,5 @@ module Integrations end end end + +Integrations::BaseChatNotification.prepend_mod_with('Integrations::BaseChatNotification') diff --git a/app/models/repository.rb b/app/models/repository.rb index fdb33008a8b..07d9bcb9368 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -632,7 +632,9 @@ class Repository return if licensee_object.name.blank? licensee_object - rescue Licensee::InvalidLicense + rescue Licensee::InvalidLicense => ex + Gitlab::ErrorTracking.track_exception(ex) + nil end memoize_method :license diff --git a/db/migrate/20210707163659_add_vulnerability_events_to_integrations.rb b/db/migrate/20210707163659_add_vulnerability_events_to_integrations.rb new file mode 100644 index 00000000000..c138af486c1 --- /dev/null +++ b/db/migrate/20210707163659_add_vulnerability_events_to_integrations.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddVulnerabilityEventsToIntegrations < ActiveRecord::Migration[6.1] + include Gitlab::Database::MigrationHelpers + + def change + add_column :integrations, :vulnerability_events, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20210707163659 b/db/schema_migrations/20210707163659 new file mode 100644 index 00000000000..e0c33c79a85 --- /dev/null +++ b/db/schema_migrations/20210707163659 @@ -0,0 +1 @@ +ac14aa49830a3af9a1445c0c7680f5660247a8104c8e4c1ae542c4b368f7c9bf
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index ea8ab0f4ea9..7cb59406ea5 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -14968,6 +14968,7 @@ CREATE TABLE integrations ( alert_events boolean, group_id bigint, type_new text, + vulnerability_events boolean DEFAULT false NOT NULL, CONSTRAINT check_a948a0aa7e CHECK ((char_length(type_new) <= 255)) ); diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md index 4b3f0e5668b..abf9d7af229 100644 --- a/doc/api/oauth2.md +++ b/doc/api/oauth2.md @@ -5,7 +5,7 @@ group: Access 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/#designated-technical-writers --- -# GitLab as an OAuth 2.0 provider +# GitLab as an OAuth 2.0 provider **(FREE)** This document covers using the [OAuth2](https://oauth.net/2/) protocol to allow other services to access GitLab resources on user's behalf. diff --git a/doc/api/services.md b/doc/api/services.md index d0c14f57eeb..a311814ca0f 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -1153,6 +1153,8 @@ Parameters: | `tag_push_events` | boolean | false | Enable notifications for tag push events | | `wiki_page_channel` | string | false | The name of the channel to receive wiki page events notifications | | `wiki_page_events` | boolean | false | Enable notifications for wiki page events | +| `vulnerability_channel` | string | false | **(ULTIMATE)** The name of the channel to receive vulnerability event notifications. | +| `vulnerability_events` | boolean | false | **(ULTIMATE)** Enable notifications for vulnerability events | ### Delete Slack service @@ -1250,6 +1252,7 @@ Parameters: | `confidential_note_events` | boolean | false | Enable notifications for confidential note events | | `pipeline_events` | boolean | false | Enable notifications for pipeline events | | `wiki_page_events` | boolean | false | Enable notifications for wiki page events | +| `vulnerability_events` | boolean | false | **(ULTIMATE)** Enable notifications for vulnerability events | | `push_channel` | string | false | The name of the channel to receive push events notifications | | `issue_channel` | string | false | The name of the channel to receive issues events notifications | | `confidential_issue_channel` | string | false | The name of the channel to receive confidential issues events notifications | @@ -1259,6 +1262,7 @@ Parameters: | `tag_push_channel` | string | false | The name of the channel to receive tag push events notifications | | `pipeline_channel` | string | false | The name of the channel to receive pipeline events notifications | | `wiki_page_channel` | string | false | The name of the channel to receive wiki page events notifications | +| `vulnerability_channel` | string | false | **(ULTIMATE)** The name of the channel to receive vulnerability events notifications | ### Delete Mattermost notifications service diff --git a/doc/topics/git/lfs/migrate_to_git_lfs.md b/doc/topics/git/lfs/migrate_to_git_lfs.md index d1231257f38..2786368a9d7 100644 --- a/doc/topics/git/lfs/migrate_to_git_lfs.md +++ b/doc/topics/git/lfs/migrate_to_git_lfs.md @@ -7,6 +7,11 @@ description: "How to migrate an existing Git repository to Git LFS with BFG." # Migrate a Git repository into Git LFS with BFG +WARNING: +The following documentation is deprecated. We recommend using +[`git lfs migrate`](https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-migrate.1.ronn) +instead of the method documented below. + Using Git LFS can help you to reduce the size of your Git repository and improve its performance. diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md index 0aecb48e497..9786d1399f7 100644 --- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md +++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md @@ -388,7 +388,6 @@ git filter-branch --tree-filter 'rm filename' HEAD The `git filter-branch` command might be slow on large repositories. Tools are available to execute Git commands more quickly. -An alternative is the open source community-maintained tool [BFG](https://rtyley.github.io/bfg-repo-cleaner/). These tools are faster because they do not provide the same feature set as `git filter-branch` does, but focus on specific use cases. diff --git a/doc/topics/gitlab_flow.md b/doc/topics/gitlab_flow.md index 60df56d153c..307a28a0f2e 100644 --- a/doc/topics/gitlab_flow.md +++ b/doc/topics/gitlab_flow.md @@ -72,10 +72,20 @@ For example, many projects do releases but don't need to do hotfixes. ## GitHub flow as a simpler alternative - - In reaction to Git flow, GitHub created a simpler alternative. -[GitHub flow](https://guides.github.com/introduction/flow/index.html) has only feature branches and a `main` branch. +[GitHub flow](https://guides.github.com/introduction/flow/index.html) has only feature branches and a `main` branch: + +```mermaid +graph TD + subgraph Feature branches in GitHub Flow + A[main branch] ===>B[main branch] + D[nav branch] --> |add navigation| B + B ===> C[main branch] + E[feature-branch] --> |add feature| C + C ==> F[main branch] + end +``` + This flow is clean and straightforward, and many organizations have adopted it with great success. Atlassian recommends [a similar strategy](https://www.atlassian.com/blog/git/simple-git-workflow-is-simple), although they rebase feature branches. Merging everything into the `main` branch and frequently deploying means you minimize the amount of unreleased code. This approach is in line with lean and continuous delivery best practices. @@ -84,8 +94,6 @@ With GitLab flow, we offer additional guidance for these questions. ## Production branch with GitLab flow - - GitHub flow assumes you can deploy to production every time you merge a feature branch. While this is possible in some cases, such as SaaS applications, there are some cases where this is not possible, such as: @@ -95,7 +103,22 @@ While this is possible in some cases, such as SaaS applications, there are some operations team is at full capacity - but you also merge code at other times. In these cases, you can make a production branch that reflects the deployed code. -You can deploy a new version by merging `main` into the production branch. +You can deploy a new version by merging `development` into the production branch: + +```mermaid +graph TD + subgraph Production branch in GitLab Flow + A[development] ==>B[development] + B ==> C[development] + C ==> D[development] + + E[production] ====> F[production] + C --> |deployment| F + D ==> G[development] + F ==> H[production] + end +``` + If you need to know what code is in production, you can check out the production branch to see. The approximate time of deployment is visible as the merge commit in the version control system. This time is pretty accurate if you automatically deploy your production branch. @@ -104,18 +127,41 @@ This flow prevents the overhead of releasing, tagging, and merging that happens ## Environment branches with GitLab flow - - -It might be a good idea to have an environment that is automatically updated to the `main` branch. +It might be a good idea to have an environment that is automatically updated to the `staging` branch. Only, in this case, the name of this environment might differ from the branch name. -Suppose you have a staging environment, a pre-production environment, and a production environment. -In this case, deploy the `main` branch to staging. -To deploy to pre-production, create a merge request from the `main` branch to the pre-production branch. -Go live by merging the pre-production branch into the production branch. +Suppose you have a staging environment, a pre-production environment, and a production environment: + +```mermaid +graph LR + subgraph Environment branches in GitLab Flow + + A[staging] ==> B[staging] + B ==> C[staging] + C ==> D[staging] + + A --> |deploy to<br>pre-prod| G + + F[pre-prod] ==> G[pre-prod] + G ==> H[pre-prod] + H ==> I[pre-prod] + + C --> |deploy to<br>pre-prod| I + + J[production] ==> K[production] + K ==> L[production] + + G --> |production <br>deployment| K + + end +``` + +In this case, deploy the `staging` branch to your staging environment. +To deploy to pre-production, create a merge request from the `staging` branch to the `pre-prod` branch. +Go live by merging the `pre-prod` branch into the `production` branch. This workflow, where commits only flow downstream, ensures that everything is tested in all environments. -If you need to cherry-pick a commit with a hotfix, it is common to develop it on a feature branch and merge it into `main` with a merge request. +If you need to cherry-pick a commit with a hotfix, it is common to develop it on a feature branch and merge it into `production` with a merge request. In this case, do not delete the feature branch yet. -If `main` passes automatic testing, you then merge the feature branch into the other branches. +If `production` passes automatic testing, you then merge the feature branch into the other branches. If this is not possible because more manual testing is required, you can send merge requests from the feature branch to the downstream branches. ## Release branches with GitLab flow diff --git a/doc/topics/img/gitlab_flow_environment_branches.png b/doc/topics/img/gitlab_flow_environment_branches.png Binary files differdeleted file mode 100644 index 0aff33c6bb8..00000000000 --- a/doc/topics/img/gitlab_flow_environment_branches.png +++ /dev/null diff --git a/doc/topics/img/gitlab_flow_github_flow.png b/doc/topics/img/gitlab_flow_github_flow.png Binary files differdeleted file mode 100644 index 21a22becdb6..00000000000 --- a/doc/topics/img/gitlab_flow_github_flow.png +++ /dev/null diff --git a/doc/topics/img/gitlab_flow_production_branch.png b/doc/topics/img/gitlab_flow_production_branch.png Binary files differdeleted file mode 100644 index c132d51bfb6..00000000000 --- a/doc/topics/img/gitlab_flow_production_branch.png +++ /dev/null diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md index e257dd5e43a..a38d2157699 100644 --- a/doc/user/project/integrations/slack.md +++ b/doc/user/project/integrations/slack.md @@ -59,19 +59,20 @@ Your Slack team now starts receiving GitLab event notifications as configured. The following triggers are available for Slack notifications: -| Trigger name | Trigger event | -|------------------------|------------------------------------------------------| -| **Push** | A push to the repository. | -| **Issue** | An issue is created, updated, or closed. | -| **Confidential issue** | A confidential issue is created, updated, or closed. | -| **Merge request** | A merge request is created, updated, or merged. | -| **Note** | A comment is added. | -| **Confidential note** | A confidential note is added. | -| **Tag push** | A new tag is pushed to the repository. | -| **Pipeline** | A pipeline status changed. | -| **Wiki page** | A wiki page is created or updated. | -| **Deployment** | A deployment starts or finishes. | -| **Alert** | A new, unique alert is recorded. | +| Trigger name | Trigger event | +| ------------------------ | ------------------------------------------------------ | +| **Push** | A push to the repository. | +| **Issue** | An issue is created, updated, or closed. | +| **Confidential issue** | A confidential issue is created, updated, or closed. | +| **Merge request** | A merge request is created, updated, or merged. | +| **Note** | A comment is added. | +| **Confidential note** | A confidential note is added. | +| **Tag push** | A new tag is pushed to the repository. | +| **Pipeline** | A pipeline status changed. | +| **Wiki page** | A wiki page is created or updated. | +| **Deployment** | A deployment starts or finishes. | +| **Alert** | A new, unique alert is recorded. | +| **Vulnerability** | **(ULTIMATE)** A new, unique vulnerability is recorded. | ## Troubleshooting diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 40c0d9e1099..6befab5ae6e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -10345,6 +10345,9 @@ msgstr "" msgid "DastProfiles|Manage profiles" msgstr "" +msgid "DastProfiles|Manage site profiles" +msgstr "" + msgid "DastProfiles|Minimum = 0 (no timeout enabled), Maximum = 2880 minutes" msgstr "" @@ -10489,7 +10492,7 @@ msgstr "" msgid "DastProfiles|Website" msgstr "" -msgid "DastProfiles|You can either choose a passive scan or validate the target site in your chosen site profile. %{docsLinkStart}Learn more about site validation.%{docsLinkEnd}" +msgid "DastProfiles|You can either choose a passive scan or validate the target site from the site profile management page. %{docsLinkStart}Learn more about site validation.%{docsLinkEnd}" msgstr "" msgid "DastProfiles|You cannot run an active scan against an unvalidated site." @@ -23472,12 +23475,6 @@ msgstr "" msgid "OnDemandScans|Use existing site profile" msgstr "" -msgid "OnDemandScans|You can either choose a passive scan or validate the target site in your chosen site profile. %{docsLinkStart}Learn more about site validation.%{docsLinkEnd}" -msgstr "" - -msgid "OnDemandScans|You cannot run an active scan against an unvalidated site." -msgstr "" - msgid "OnDemandScans|You must create a repository within your project to run an on-demand scan." msgstr "" @@ -26258,6 +26255,9 @@ msgstr "" msgid "ProjectService|Trigger event when a new, unique alert is recorded." msgstr "" +msgid "ProjectService|Trigger event when a new, unique vulnerability is recorded. (Note: This feature requires an Ultimate plan.)" +msgstr "" + msgid "ProjectService|Trigger event when a pipeline status changes." msgstr "" diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index eeb82cc9bee..6d50c55b011 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1340,6 +1340,9 @@ RSpec.describe Repository do it 'returns nil when license_key is not recognized' do expect(repository).to receive(:license_key).twice.and_return('not-recognized') + expect(Gitlab::ErrorTracking).to receive(:track_exception) do |ex| + expect(ex).to be_a(Licensee::InvalidLicense) + end expect(repository.license).to be_nil end |
