diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-05-12 09:59:28 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-05-12 10:14:43 +0100 |
| commit | e0cdb7323e09f17d1154578efb329ea941448c69 (patch) | |
| tree | b4ae80002d961f85d82ed30a959e31683a91ffdd | |
| parent | a0e476ca59cfed44eb1f0c7cab0ffde0b25160a0 (diff) | |
| download | gitlab-ce-14098-customize-after-sign-up-path.tar.gz | |
fixup! Allow custom text on 'almost there' page14098-customize-after-sign-up-path
| -rw-r--r-- | app/assets/stylesheets/pages/confirmation.scss | 2 | ||||
| -rw-r--r-- | app/models/application_setting.rb | 13 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/confirmation.scss b/app/assets/stylesheets/pages/confirmation.scss index 11f50e9cbc9..1213e4dcd19 100644 --- a/app/assets/stylesheets/pages/confirmation.scss +++ b/app/assets/stylesheets/pages/confirmation.scss @@ -2,7 +2,7 @@ margin-bottom: 20px; border-bottom: 1px solid #eee; - > h1 { + > h1, h2, h3, h4, h5, h6 { font-weight: 400; } diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 50bf80ba159..3fdaf471db1 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -38,17 +38,16 @@ # recaptcha_site_key :string # recaptcha_private_key :string # metrics_port :integer default(8089) +# akismet_enabled :boolean default(FALSE) +# akismet_api_key :string # metrics_sample_interval :integer default(15) # sentry_enabled :boolean default(FALSE) # sentry_dsn :string -# akismet_enabled :boolean default(FALSE) -# akismet_api_key :string # email_author_in_body :boolean default(FALSE) # default_group_visibility :integer # repository_checks_enabled :boolean default(FALSE) -# metrics_packet_size :integer default(1) # shared_runners_text :text -# after_sign_up_text :text +# metrics_packet_size :integer default(1) # class ApplicationSetting < ActiveRecord::Base @@ -145,8 +144,10 @@ class ApplicationSetting < ActiveRecord::Base 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'], - after_sign_up_text: Settings.extra['after_sign_up_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'], diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 597fa75d368..68b0199f7b3 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -22,8 +22,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'], - after_sign_up_text: Settings.extra['after_sign_up_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'], |