Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

5 files changed, 80 insertions, 148 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 909f9972712..ecffcb5262c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 7.11.0 (unreleased)
   - Improve UI for mobile phones on dashboard and project pages
   - Add room notification and message color option for HipChat
   - Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka)
+  - Add footnotes support to Markdown (Guillaume Delbergue)
 
 v 7.10.0
   - Ignore submodules that are defined in .gitmodules but are checked in as directories.
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index aff7011edd0..bc234500000 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -49,7 +49,8 @@ module GitlabMarkdownHelper
         strikethrough:       true,
         lax_spacing:         true,
         space_after_headers: true,
-        superscript:         true
+        superscript:         true,
+        footnotes:           true
       )
     end
 
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index 34ca7776c9e..cdbfc60f9a4 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -4,79 +4,7 @@
 %p #{@service.description} template
 
 = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
-  - if @service.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @service.errors.full_messages.each do |msg|
-          %p= msg
-  - if @service.help.present?
-    .well
-      = preserve do
-        = markdown @service.help
-
-  .form-group
-    = form.label :active, "Active", class: "control-label"
-    .col-sm-10
-      = form.check_box :active
-
-  - if @service.supported_events.length > 1
-    .form-group
-      = form.label :url, "Trigger", class: 'control-label'
-      .col-sm-10
-        - if @service.supported_events.include?("push")
-          %div
-            = form.check_box :push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :push_events, class: 'list-label' do
-                %strong Push events
-              %p.light
-                This url will be triggered by a push to the repository
-        - if @service.supported_events.include?("tag_push")
-          %div
-            = form.check_box :tag_push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :tag_push_events, class: 'list-label' do
-                %strong Tag push events
-              %p.light
-                This url will be triggered when a new tag is pushed to the repository
-        - if @service.supported_events.include?("note")
-          %div
-            = form.check_box :note_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :note_events, class: 'list-label' do
-                %strong Comments
-              %p.light
-                This url will be triggered when someone adds a comment
-        - if @service.supported_events.include?("issue")
-          %div
-            = form.check_box :issues_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :issues_events, class: 'list-label' do
-                %strong Issues events
-              %p.light
-                This url will be triggered when an issue is created
-        - if @service.supported_events.include?("merge_request")
-          %div
-            = form.check_box :merge_requests_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :merge_requests_events, class: 'list-label' do
-                %strong Merge Request events
-              %p.light
-                This url will be triggered when a merge request is created
-
-  - @service.fields.each do |field|
-    - type = field[:type]
-
-    - if type == 'fieldset'
-      - fields = field[:fields]
-      - legend = field[:legend]
-
-      %fieldset
-        %legend= legend
-        - fields.each do |subfield|
-          = render 'shared/field', form: form, field: subfield
-    - else
-      = render 'shared/field', form: form, field: field
+  = render 'shared/service_settings', form: form
 
   .form-actions
     = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 1b465e3addd..e1823b51198 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -11,80 +11,7 @@
 %hr
 
 = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
-  - if @service.errors.any?
-    .alert.alert-danger
-      %ul
-        - @service.errors.full_messages.each do |msg|
-          %li= msg
-
-  - if @service.help.present?
-    .well
-      = preserve do
-        = markdown @service.help
-
-  .form-group
-    = form.label :active, "Active", class: "control-label"
-    .col-sm-10
-      = form.check_box :active
-
-  - if @service.supported_events.length > 1
-    .form-group
-      = form.label :url, "Trigger", class: 'control-label'
-      .col-sm-10
-        - if @service.supported_events.include?("push")
-          %div
-            = form.check_box :push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :push_events, class: 'list-label' do
-                %strong Push events
-              %p.light
-                This url will be triggered by a push to the repository
-        - if @service.supported_events.include?("tag_push")
-          %div
-            = form.check_box :tag_push_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :tag_push_events, class: 'list-label' do
-                %strong Tag push events
-              %p.light
-                This url will be triggered when a new tag is pushed to the repository
-        - if @service.supported_events.include?("note")
-          %div
-            = form.check_box :note_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :note_events, class: 'list-label' do
-                %strong Comments
-              %p.light
-                This url will be triggered when someone adds a comment
-        - if @service.supported_events.include?("issue")
-          %div
-            = form.check_box :issues_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :issues_events, class: 'list-label' do
-                %strong Issues events
-              %p.light
-                This url will be triggered when an issue is created
-        - if @service.supported_events.include?("merge_request")
-          %div
-            = form.check_box :merge_requests_events, class: 'pull-left'
-            .prepend-left-20
-              = form.label :merge_requests_events, class: 'list-label' do
-                %strong Merge Request events
-              %p.light
-                This url will be triggered when a merge request is created
-
-  - @service.fields.each do |field|
-    - type = field[:type]
-
-    - if type == 'fieldset'
-      - fields = field[:fields]
-      - legend = field[:legend]
-
-      %fieldset
-        %legend= legend
-        - fields.each do |subfield|
-          = render 'shared/field', form: form, field: subfield
-    - else
-      = render 'shared/field', form: form, field: field
+  = render 'shared/service_settings', form: form
 
   .form-actions
     = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
new file mode 100644
index 00000000000..16a98a7233c
--- /dev/null
+++ b/app/views/shared/_service_settings.html.haml
@@ -0,0 +1,75 @@
+- if @service.errors.any?
+  #error_explanation
+    .alert.alert-danger
+      %ul
+        - @service.errors.full_messages.each do |msg|
+          %li= msg
+
+- if @service.help.present?
+  .well
+    = preserve do
+      = markdown @service.help
+
+.form-group
+  = form.label :active, "Active", class: "control-label"
+  .col-sm-10
+    = form.check_box :active
+
+- if @service.supported_events.length > 1
+  .form-group
+    = form.label :url, "Trigger", class: 'control-label'
+    .col-sm-10
+      - if @service.supported_events.include?("push")
+        %div
+          = form.check_box :push_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :push_events, class: 'list-label' do
+              %strong Push events
+            %p.light
+              This url will be triggered by a push to the repository
+      - if @service.supported_events.include?("tag_push")
+        %div
+          = form.check_box :tag_push_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :tag_push_events, class: 'list-label' do
+              %strong Tag push events
+            %p.light
+              This url will be triggered when a new tag is pushed to the repository
+      - if @service.supported_events.include?("note")
+        %div
+          = form.check_box :note_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :note_events, class: 'list-label' do
+              %strong Comments
+            %p.light
+              This url will be triggered when someone adds a comment
+      - if @service.supported_events.include?("issue")
+        %div
+          = form.check_box :issues_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :issues_events, class: 'list-label' do
+              %strong Issues events
+            %p.light
+              This url will be triggered when an issue is created
+      - if @service.supported_events.include?("merge_request")
+        %div
+          = form.check_box :merge_requests_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :merge_requests_events, class: 'list-label' do
+              %strong Merge Request events
+            %p.light
+              This url will be triggered when a merge request is created
+
+- @service.fields.each do |field|
+  - type = field[:type]
+
+  - if type == 'fieldset'
+    - fields = field[:fields]
+    - legend = field[:legend]
+
+    %fieldset
+      %legend= legend
+      - fields.each do |subfield|
+        = render 'shared/field', form: form, field: subfield
+  - else
+    = render 'shared/field', form: form, field: field