diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-07 15:58:38 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-07 15:58:38 +0300 |
| commit | 05033177d7349b5301ac9898a5acd0184b009f55 (patch) | |
| tree | 0a59c8b0e7e580601f8097cfbd1ce8ffb6717bbb /lib/api | |
| parent | 294129475c0977ce8bd32a6fa43b62af5022ee67 (diff) | |
| parent | 433bcf9b0439771b1e2661a62fec115e44922232 (diff) | |
Merge branch 'local-markdown-version' into 'master'
Add local markdown version
Closes #32789
See merge request gitlab-org/gitlab-ce!24822
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 95371961398..b16faffe335 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -121,6 +121,7 @@ module API optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' 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" ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |