diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 09:07:54 +0000 |
| commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
| tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /app/controllers | |
| parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
| download | gitlab-ce-87ef501eacd66d7166183d20d84e33de022f7002.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 2b7571e42b7..c9f46eb72c5 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -117,6 +117,7 @@ class ProfilesController < Profiles::ApplicationController :private_profile, :include_private_contributions, :timezone, + :job_title, status: [:emoji, :message] ) end diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index c4cc1adcd4e..aac6ecb07e4 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -66,7 +66,7 @@ module Projects [ :runners_token, :builds_enabled, :build_allow_git_fetch, :build_timeout_human_readable, :build_coverage_regex, :public_builds, - :auto_cancel_pending_pipelines, :ci_config_path, + :auto_cancel_pending_pipelines, :forward_deployment_enabled, :ci_config_path, auto_devops_attributes: [:id, :domain, :enabled, :deploy_strategy], ci_cd_settings_attributes: [:default_git_depth] ].tap do |list| |