diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 12:08:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 12:08:38 +0300 |
| commit | 477c2c26047bc2d2da32b31eb8b26a6397675931 (patch) | |
| tree | ac863e97c714d08c93267650ba60af613f5777ae /config | |
| parent | 4be2167e71cf1b19a049fdced9356f311a364c7f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml | 7 | ||||
| -rw-r--r-- | config/locales/devise.en.yml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml b/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml new file mode 100644 index 00000000000..81a0d014b12 --- /dev/null +++ b/config/feature_flags/development/ci_disallow_to_create_merge_request_pipelines_in_target_project.yml @@ -0,0 +1,7 @@ +--- +name: ci_disallow_to_create_merge_request_pipelines_in_target_project +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40724 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235119 +group: group::progressive delivery +type: development +default_enabled: false diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index e8110e21766..e4a46be9bf3 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -25,6 +25,8 @@ en: subject: "Unlock instructions" password_change: subject: "Password Changed" + password_change_by_admin: + subject: "Password changed by administrator" omniauth_callbacks: failure: "Could not authenticate you from %{kind} because \"%{reason}\"." success: "Successfully authenticated from %{kind} account." |