diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:27:06 +0200 |
| commit | 95a10f4533fdb708c61ffda95099bddd94800f02 (patch) | |
| tree | bf5c561472c47d34e5ff1f643c49cd2a6b206f15 /lib/gitlab/current_settings.rb | |
| parent | 17c6bec79d876ce932edc0edc5d17622adb2f724 (diff) | |
| parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
| download | gitlab-ce-95a10f4533fdb708c61ffda95099bddd94800f02.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-lfs-fetch
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 92c7e8b9d88..5e7532f57ae 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -26,7 +26,10 @@ module Gitlab signup_enabled: Settings.gitlab['signup_enabled'], signin_enabled: Settings.gitlab['signin_enabled'], gravatar_enabled: Settings.gravatar['enabled'], - sign_in_text: Settings.extra['sign_in_text'], + sign_in_text: nil, + after_sign_up_text: nil, + help_page_text: nil, + shared_runners_text: nil, restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], max_attachment_size: Settings.gitlab['max_attachment_size'], session_expire_delay: Settings.gitlab['session_expire_delay'], |