Commit 4048249b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix conflict in app/views/admin/application_settings/_form.html.haml

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent aef66258
......@@ -12,11 +12,8 @@
.col-sm-10
= f.number_field :container_registry_token_expire_delay, class: 'form-control'
<<<<<<< HEAD
= render partial: 'elasticsearch_form', locals: { f: f }
=======
>>>>>>> upstream/master
- if koding_enabled?
%fieldset
%legend Koding
......@@ -177,7 +174,6 @@
AuthorizedKeysCommand. Click on the help icon for more details.
= link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup')
<<<<<<< HEAD
- if Gitlab.com? || Rails.env.development?
%fieldset
%legend Slack application
......@@ -218,7 +214,5 @@
- if License.feature_available?(:external_authorization_service)
= render partial: 'external_authorization_service_form', locals: { f: f }
=======
>>>>>>> upstream/master
.form-actions
= f.submit 'Save', class: 'btn btn-save'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment