diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-12 16:13:24 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 15:20:55 +0200 |
| commit | 380e40fee30d836e6dffb1e956df39033d43a671 (patch) | |
| tree | 8258a84cb620aa707539730815cccc62ff8d0335 /config | |
| parent | 00e9568e140165edcc091bd6729393cdeaac642b (diff) | |
| download | gitlab-ce-380e40fee30d836e6dffb1e956df39033d43a671.tar.gz | |
Remove unused user activities code
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 96d39f7c4b3..2ccf9e45111 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -212,8 +212,8 @@ Settings.gitlab['email_from'] ||= ENV['GITLAB_EMAIL_FROM'] || "gitlab@#{Settings Settings.gitlab['email_display_name'] ||= ENV['GITLAB_EMAIL_DISPLAY_NAME'] || 'GitLab' Settings.gitlab['email_reply_to'] ||= ENV['GITLAB_EMAIL_REPLY_TO'] || "noreply@#{Settings.gitlab.host}" Settings.gitlab['email_subject_suffix'] ||= ENV['GITLAB_EMAIL_SUBJECT_SUFFIX'] || "" -Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url) -Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) +Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) +Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir |