gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix position of mattermsot teammate_name_display setting

This commit is contained in:
Balasankar C 2017-08-01 18:57:50 +05:30
parent c7e9b8ae73
commit ad3a4f585d
No known key found for this signature in database
GPG Key ID: 96EDAB9B2E6B7171
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-config-template/gitlab.rb.template
View File

@ -1048,7 +1048,6 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['service_enable_user_statuses'] = true
# mattermost['service_enable_emoji_picker'] = true
# mattermost['service_enable_channel_viewed_messages'] = true
# mattermost['service_teammate_name_display'] = "full_name"
# mattermost['service_enable_apiv3'] = true
# mattermost['service_goroutine_health_threshold'] = -1
@ -1064,6 +1063,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['team_restrict_direct_message'] = "any"
# mattermost['team_max_channels_per_team'] = 2000
# mattermost['team_user_status_away_timeout'] = 300
# mattermost['team_teammate_name_display'] = "full_name"
# mattermost['sql_driver_name'] = 'mysql'
# mattermost['sql_data_source'] = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -723,7 +723,6 @@ default['gitlab']['mattermost']['service_enable_post_search'] = true
default['gitlab']['mattermost']['service_enable_user_statuses'] = true
default['gitlab']['mattermost']['service_enable_emoji_picker'] = true
default['gitlab']['mattermost']['service_enable_channel_viewed_messages'] = true
default['gitlab']['mattermost']['service_teammate_name_display'] = "full_name"
default['gitlab']['mattermost']['service_enable_apiv3'] = true
default['gitlab']['mattermost']['service_goroutine_health_threshold'] = -1
@ -803,6 +802,7 @@ default['gitlab']['mattermost']['team_restrict_team_names'] = true
default['gitlab']['mattermost']['team_restrict_direct_message'] = "any"
default['gitlab']['mattermost']['team_max_channels_per_team'] = 2000
default['gitlab']['mattermost']['team_user_status_away_timeout'] = 300
default['gitlab']['mattermost']['team_teammate_name_display'] = "full_name"
default['gitlab']['mattermost']['support_terms_of_service_link'] = "/static/help/terms.html"
default['gitlab']['mattermost']['support_privacy_policy_link'] = "/static/help/privacy.html"

4
files/gitlab-cookbooks/gitlab/templates/default/config.json.erb
View File

@ -36,7 +36,6 @@
"EnableUserStatuses" : <%= @service_enable_post_search %>,
"EnableEmojiPicker" : <%= @service_enable_emoji_picker %>,
"EnableChannelViewedMessages" : <%= @service_enable_channel_viewed_messages %>,
"TeammateNameDisplay" : "<%= @service_teammate_name_display %>",
"EnableAPIv3" : <%= @service_enable_apiv3 %>,
"GoroutineHealthThreshold" : <%= @service_goroutine_health_threshold %>
},
@ -50,7 +49,8 @@
"RestrictTeamNames": <%= @team_restrict_team_names %>,
"RestrictDirectMessage": "<%= @team_restrict_direct_message %>",
"MaxChannelsPerTeam": <%= @team_max_channels_per_team %>,
"UserStatusAwayTimeout": <%= @team_user_status_away_timeout %>
"UserStatusAwayTimeout": <%= @team_user_status_away_timeout %>,
"TeammateNameDisplay" : "<%= @team_teammate_name_display %>"
},
"SqlSettings": {
"DriverName": "<%= @sql_driver_name %>",