diff options
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 4 | ||||
| -rw-r--r-- | spec/models/concerns/issuable_spec.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 684ade87720..e8d3a19fb67 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -71,9 +71,7 @@ .submit-container.gl-mt-5 = f.submit button_text, pajamas_button: true, class: 'gl-w-full', data: { qa_selector: 'new_user_register_button' } - - if Gitlab::CurrentSettings.sign_in_text.present? && Feature.enabled?(:restyle_login_page, @project) - .gl-pt-5 - = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) + = render 'devise/shared/terms_of_service_notice', button_text: button_text = yield :omniauth_providers_bottom if show_omniauth_providers diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb index 4e99419a7f2..e4af778b967 100644 --- a/spec/models/concerns/issuable_spec.rb +++ b/spec/models/concerns/issuable_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Issuable do +RSpec.describe Issuable, feature_category: :team_planning do include ProjectForksHelper using RSpec::Parameterized::TableSyntax |