diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 09:08:46 +0000 |
| commit | b806264d29b8d52ccb78a41dcc3d67f2b040700c (patch) | |
| tree | af97e9d36b2c82520d6850836dee6ba8d7ed9b17 /lib/api | |
| parent | 34ab9be97ecf84dd2b7a3b8f3149c0f7d1d7ab5c (diff) | |
| download | gitlab-ce-b806264d29b8d52ccb78a41dcc3d67f2b040700c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index f816a94801a..5362b3060c1 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -142,7 +142,6 @@ module API requires :sourcegraph_url, type: String, desc: 'The configured Sourcegraph instance URL' end optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' - optional :updating_name_disabled_for_users, type: Boolean, desc: 'Flag indicating if users are permitted to update their profile name' optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.' optional :instance_statistics_visibility_private, type: Boolean, desc: 'When set to `true` Instance statistics will only be available to admins' optional :local_markdown_version, type: Integer, desc: 'Local markdown version, increase this value when any cached markdown should be invalidated' |