From 16402e6b867476c80c4e640855d50e0dde43df5e Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Sun, 19 Feb 2017 19:38:54 -0600
Subject: [PATCH] Fixed the "Save changes" button in the push rules section
---
.vscode/settings.json | 1 +
app/views/projects/mirrors/_show.html.haml | 5 ++---
app/views/projects/protected_branches/_index.html.haml | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
create mode 100644 .vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000..9e26dfeeb6e64
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/app/views/projects/mirrors/_show.html.haml b/app/views/projects/mirrors/_show.html.haml
index 0a2e053ef3621..94aaad9466354 100644
--- a/app/views/projects/mirrors/_show.html.haml
+++ b/app/views/projects/mirrors/_show.html.haml
@@ -81,6 +81,5 @@
.form-group
= rm_form.label :sync_time, "Synchronization time", class: "label-light append-bottom-0"
= rm_form.select :sync_time, options_for_select(mirror_sync_time_options, @remote_mirror.sync_time), {}, class: 'form-control remote-mirror-sync-time'
- .col-sm-12.text-center
- %hr
- = f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror'
+ = f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror'
+%hr
diff --git a/app/views/projects/protected_branches/_index.html.haml b/app/views/projects/protected_branches/_index.html.haml
index 010ba5a24a780..2d8c519c025dd 100644
--- a/app/views/projects/protected_branches/_index.html.haml
+++ b/app/views/projects/protected_branches/_index.html.haml
@@ -1,11 +1,10 @@
-- page_title "Protected branches"
- content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('protected_branches')
.row.prepend-top-default.append-bottom-default
.col-lg-3
%h4.prepend-top-0
- = page_title
+ Protected Branches
%p Keep stable branches secure and force developers to use merge requests.
%p.prepend-top-20
By default, protected branches are designed to:
--
GitLab