diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 18:08:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 18:08:30 +0300 |
commit | a0fdcfcdd514c2af98f18cadfa75f8a6a85b4d2c (patch) | |
tree | ecba106fd4d1426cc2109a6ba3da091be2de1f87 /config | |
parent | 2828f81d2a41f46b89e13dc057b982f27aeee547 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/events/1655726589_ide_edit_g_edit_by_web_ide.yml | 22 | ||||
-rw-r--r-- | config/events/1655726622_ide_edit_g_edit_by_live_preview.yml | 22 | ||||
-rw-r--r-- | config/events/1655726650_ide_edit_g_edit_by_sfe.yml | 22 | ||||
-rw-r--r-- | config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml | 22 | ||||
-rw-r--r-- | config/feature_flags/development/require_email_verification.yml | 8 | ||||
-rw-r--r-- | config/gitlab.yml.example | 6 | ||||
-rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
-rw-r--r-- | config/routes/user.rb | 2 |
8 files changed, 98 insertions, 8 deletions
diff --git a/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml b/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml new file mode 100644 index 00000000000..128bfaf6029 --- /dev/null +++ b/config/events/1655726589_ide_edit_g_edit_by_web_ide.yml @@ -0,0 +1,22 @@ +--- +description: Triggered from backend on editing file in web ide +category: ide_edit +action: g_edit_by_web_ide +identifiers: +- project +- user +- namespace +product_section: dev +product_stage: create +product_group: group::editor +product_category: web_ide +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml b/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml new file mode 100644 index 00000000000..d9d54e1c311 --- /dev/null +++ b/config/events/1655726622_ide_edit_g_edit_by_live_preview.yml @@ -0,0 +1,22 @@ +--- +description: Triggered from backend on showing a file in live preview +category: ide_edit +action: g_edit_by_live_preview +identifiers: + - project + - user + - namespace +product_section: dev +product_stage: create +product_group: group::editor +product_category: web_ide +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +distributions: + - ce + - ee +tiers: + - free + - premium + - ultimate + diff --git a/config/events/1655726650_ide_edit_g_edit_by_sfe.yml b/config/events/1655726650_ide_edit_g_edit_by_sfe.yml new file mode 100644 index 00000000000..9acdc317cf5 --- /dev/null +++ b/config/events/1655726650_ide_edit_g_edit_by_sfe.yml @@ -0,0 +1,22 @@ +--- +description: Triggered from backend on editing file by sfe +category: ide_edit +action: g_edit_by_sfe +identifiers: + - project + - user + - namespace +product_section: dev +product_stage: create +product_group: group::editor +product_category: web_ide +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +distributions: + - ce + - ee +tiers: + - free + - premium + - ultimate + diff --git a/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml b/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml new file mode 100644 index 00000000000..2b3ed1a5d7a --- /dev/null +++ b/config/events/1655726683_ide_edit_g_edit_by_snippet_ide.yml @@ -0,0 +1,22 @@ +--- +description: Triggered from backend on editing file by ide snippet +category: ide_edit +action: g_edit_by_snippet_ide +identifiers: + - project + - user + - namespace +product_section: dev +product_stage: create +product_group: group::editor +product_category: web_ide +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90484 +distributions: + - ce + - ee +tiers: + - free + - premium + - ultimate + diff --git a/config/feature_flags/development/require_email_verification.yml b/config/feature_flags/development/require_email_verification.yml new file mode 100644 index 00000000000..e6cb78ffcf7 --- /dev/null +++ b/config/feature_flags/development/require_email_verification.yml @@ -0,0 +1,8 @@ +--- +name: require_email_verification +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86352 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364835 +milestone: "15.2" +type: development +group: group::anti-abuse +default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 91b197afd32..ed1684b48a5 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -661,12 +661,6 @@ production: &base gitlab_ci: # Default project notifications settings: - # - # Send emails only on broken builds (default: true) - # all_broken_builds: true - # - # Add pusher to recipients list (default: false) - # add_pusher: true # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root # builds_path: builds/ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c94f0009678..dca82e73075 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -241,8 +241,6 @@ end # Settings['gitlab_ci'] ||= Settingslogic.new({}) Settings.gitlab_ci['shared_runners_enabled'] = true if Settings.gitlab_ci['shared_runners_enabled'].nil? -Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_broken_builds'].nil? -Settings.gitlab_ci['add_pusher'] = false if Settings.gitlab_ci['add_pusher'].nil? Settings.gitlab_ci['builds_path'] = Settings.absolute(Settings.gitlab_ci['builds_path'] || "builds/") Settings.gitlab_ci['url'] ||= Settings.__send__(:build_gitlab_ci_url) diff --git a/config/routes/user.rb b/config/routes/user.rb index ccacf817cc5..a5fc53b61d2 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -53,6 +53,8 @@ end devise_scope :user do get '/users/almost_there' => 'confirmations#almost_there' + post '/users/resend_verification_code', to: 'sessions#resend_verification_code' + get '/users/successful_verification', to: 'sessions#successful_verification' end scope '-/users', module: :users do |